Drop prefixes from test data resource IDs
These prefixes were only available in IDs aquired with the old API.
BUG=None
TEST=git cl try
Review URL: https://codereview.chromium.org/439713003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287322 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
index 2771e2a..45efac3d 100644
--- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
@@ -49,24 +49,24 @@
directory.mutable_file_info()->set_is_directory(true);
directory.set_title("Directory 1");
- directory.set_resource_id("folder:1_folder_resource_id");
+ directory.set_resource_id("1_folder_resource_id");
change_lists[0]->mutable_entries()->push_back(directory);
change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
directory.set_title("Sub Directory Folder");
- directory.set_resource_id("folder:sub_dir_folder_resource_id");
+ directory.set_resource_id("sub_dir_folder_resource_id");
change_lists[0]->mutable_entries()->push_back(directory);
change_lists[0]->mutable_parent_resource_ids()->push_back(
- "folder:1_folder_resource_id");
+ "1_folder_resource_id");
directory.set_title("Sub Sub Directory Folder");
- directory.set_resource_id("folder:sub_sub_directory_folder_id");
+ directory.set_resource_id("sub_sub_directory_folder_id");
change_lists[0]->mutable_entries()->push_back(directory);
change_lists[0]->mutable_parent_resource_ids()->push_back(
- "folder:sub_dir_folder_resource_id");
+ "sub_dir_folder_resource_id");
directory.set_title("Directory 2 excludeDir-test");
- directory.set_resource_id("folder:sub_dir_folder_2_self_link");
+ directory.set_resource_id("sub_dir_folder_2_self_link");
change_lists[0]->mutable_entries()->push_back(directory);
change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
@@ -74,18 +74,18 @@
ResourceEntry file;
file.set_title("File 1.txt");
- file.set_resource_id("file:2_file_resource_id");
+ file.set_resource_id("2_file_resource_id");
change_lists[0]->mutable_entries()->push_back(file);
change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
file.set_title("SubDirectory File 1.txt");
- file.set_resource_id("file:subdirectory_file_1_id");
+ file.set_resource_id("subdirectory_file_1_id");
change_lists[0]->mutable_entries()->push_back(file);
change_lists[0]->mutable_parent_resource_ids()->push_back(
- "folder:1_folder_resource_id");
+ "1_folder_resource_id");
file.set_title("Orphan File 1.txt");
- file.set_resource_id("file:1_orphanfile_resource_id");
+ file.set_resource_id("1_orphanfile_resource_id");
change_lists[0]->mutable_entries()->push_back(file);
change_lists[0]->mutable_parent_resource_ids()->push_back("");
@@ -175,23 +175,23 @@
// Root files
{"drive/root", kRootId, "", DIRECTORY},
{"drive/root/File 1.txt",
- "file:2_file_resource_id", kRootId, FILE},
+ "2_file_resource_id", kRootId, FILE},
// Subdirectory files
{"drive/root/Directory 1",
- "folder:1_folder_resource_id", kRootId, DIRECTORY},
+ "1_folder_resource_id", kRootId, DIRECTORY},
{"drive/root/Directory 1/SubDirectory File 1.txt",
- "file:subdirectory_file_1_id", "folder:1_folder_resource_id", FILE},
+ "subdirectory_file_1_id", "1_folder_resource_id", FILE},
{"drive/root/Directory 2 excludeDir-test",
- "folder:sub_dir_folder_2_self_link", kRootId, DIRECTORY},
+ "sub_dir_folder_2_self_link", kRootId, DIRECTORY},
// Deeper
{"drive/root/Directory 1/Sub Directory Folder",
- "folder:sub_dir_folder_resource_id",
- "folder:1_folder_resource_id", DIRECTORY},
+ "sub_dir_folder_resource_id",
+ "1_folder_resource_id", DIRECTORY},
{"drive/root/Directory 1/Sub Directory Folder/Sub Sub Directory Folder",
- "folder:sub_sub_directory_folder_id",
- "folder:sub_dir_folder_resource_id", DIRECTORY},
+ "sub_sub_directory_folder_id",
+ "sub_dir_folder_resource_id", DIRECTORY},
// Orphan
- {"drive/other/Orphan File 1.txt", "file:1_orphanfile_resource_id",
+ {"drive/other/Orphan File 1.txt", "1_orphanfile_resource_id",
"", FILE},
};
@@ -218,14 +218,14 @@
change_lists.push_back(new ChangeList);
ResourceEntry new_folder;
- new_folder.set_resource_id("folder:new_folder_resource_id");
+ new_folder.set_resource_id("new_folder_resource_id");
new_folder.set_title("New Directory");
new_folder.mutable_file_info()->set_is_directory(true);
change_lists[0]->mutable_entries()->push_back(new_folder);
change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
ResourceEntry new_file;
- new_file.set_resource_id("document:file_added_in_new_dir_id");
+ new_file.set_resource_id("file_added_in_new_dir_id");
new_file.set_title("File in new dir.txt");
change_lists[0]->mutable_entries()->push_back(new_file);
change_lists[0]->mutable_parent_resource_ids()->push_back(
@@ -259,12 +259,12 @@
change_lists.push_back(new ChangeList);
ResourceEntry entry;
- entry.set_resource_id("folder:1_folder_resource_id");
+ entry.set_resource_id("1_folder_resource_id");
entry.set_title("Directory 1");
entry.mutable_file_info()->set_is_directory(true);
change_lists[0]->mutable_entries()->push_back(entry);
change_lists[0]->mutable_parent_resource_ids()->push_back(
- "folder:sub_dir_folder_2_self_link");
+ "sub_dir_folder_2_self_link");
change_lists[0]->set_largest_changestamp(16809);
@@ -298,7 +298,7 @@
change_lists.push_back(new ChangeList);
ResourceEntry entry;
- entry.set_resource_id("file:subdirectory_file_1_id");
+ entry.set_resource_id("subdirectory_file_1_id");
entry.set_title("SubDirectory File 1.txt");
change_lists[0]->mutable_entries()->push_back(entry);
change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
@@ -330,11 +330,11 @@
change_lists.push_back(new ChangeList);
ResourceEntry entry;
- entry.set_resource_id("file:subdirectory_file_1_id");
+ entry.set_resource_id("subdirectory_file_1_id");
entry.set_title("New SubDirectory File 1.txt");
change_lists[0]->mutable_entries()->push_back(entry);
change_lists[0]->mutable_parent_resource_ids()->push_back(
- "folder:1_folder_resource_id");
+ "1_folder_resource_id");
change_lists[0]->set_largest_changestamp(16767);
@@ -365,7 +365,7 @@
change_lists.push_back(new ChangeList);
ResourceEntry entry;
- entry.set_resource_id("document:added_in_root_id");
+ entry.set_resource_id("added_in_root_id");
entry.set_title("Added file.txt");
change_lists[0]->mutable_entries()->push_back(entry);
change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
@@ -413,11 +413,11 @@
change_lists.push_back(new ChangeList);
ResourceEntry entry;
- entry.set_resource_id("document:added_in_root_id");
+ entry.set_resource_id("added_in_root_id");
entry.set_title("Added file.txt");
change_lists[0]->mutable_entries()->push_back(entry);
change_lists[0]->mutable_parent_resource_ids()->push_back(
- "folder:1_folder_resource_id");
+ "1_folder_resource_id");
change_lists[0]->set_largest_changestamp(16730);
@@ -441,7 +441,7 @@
entry.set_deleted(true);
change_lists[0]->mutable_entries()->push_back(entry);
change_lists[0]->mutable_parent_resource_ids()->push_back(
- "folder:1_folder_resource_id");
+ "1_folder_resource_id");
change_lists[0]->set_largest_changestamp(16770);
@@ -466,15 +466,15 @@
change_lists.push_back(new ChangeList);
ResourceEntry file;
- file.set_resource_id("pdf:file_added_in_deleted_id");
+ file.set_resource_id("file_added_in_deleted_id");
file.set_title("new_pdf_file.pdf");
file.set_deleted(true);
change_lists[0]->mutable_entries()->push_back(file);
change_lists[0]->mutable_parent_resource_ids()->push_back(
- "folder:new_folder_resource_id");
+ "new_folder_resource_id");
ResourceEntry directory;
- directory.set_resource_id("folder:new_folder_resource_id");
+ directory.set_resource_id("new_folder_resource_id");
directory.set_title("New Directory");
directory.mutable_file_info()->set_is_directory(true);
directory.set_deleted(true);
diff --git a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc
index 2e44ed2..37d75c7 100644
--- a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc
@@ -122,7 +122,7 @@
ASSERT_EQ(FILE_ERROR_OK, error);
ASSERT_TRUE(entry);
- EXPECT_EQ("folder:sub_dir_folder_resource_id", entry->resource_id());
+ EXPECT_EQ("sub_dir_folder_resource_id", entry->resource_id());
}
TEST_F(FakeFileSystemTest, GetResourceEntry_Root) {
diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc
index 8fcd6cad..03a0c3b6 100644
--- a/chrome/browser/chromeos/drive/file_cache_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc
@@ -537,7 +537,7 @@
}
TEST_F(FileCacheTest, ClearAll) {
- const std::string id("pdf:1a2b");
+ const std::string id("1a2b");
const std::string md5("abcdef0123456789");
// Store an existing file.
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
index 64187b6..0d2e6ca 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
@@ -126,8 +126,8 @@
// matches "drive/root/Document 1 excludeDir-test".
ASSERT_TRUE(util::CreateGDocFile(
local_src_path,
- GURL("https://3_document_self_link/document:5_document_resource_id"),
- "document:5_document_resource_id"));
+ GURL("https://3_document_self_link/5_document_resource_id"),
+ "5_document_resource_id"));
ResourceEntry entry;
ASSERT_EQ(FILE_ERROR_NOT_FOUND,
@@ -147,7 +147,7 @@
EXPECT_EQ(1U, delegate()->get_changed_files().size());
EXPECT_TRUE(delegate()->get_changed_files().count(remote_dest_path));
// New copy is created.
- EXPECT_NE("document:5_document_resource_id", entry.resource_id());
+ EXPECT_NE("5_document_resource_id", entry.resource_id());
}
TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_OrphanHostedDocument) {
@@ -159,8 +159,8 @@
// matches "drive/other/Orphan Document".
ASSERT_TRUE(util::CreateGDocFile(
local_src_path,
- GURL("https://3_document_self_link/document:orphan_doc_1"),
- "document:orphan_doc_1"));
+ GURL("https://3_document_self_link/orphan_doc_1"),
+ "orphan_doc_1"));
ResourceEntry entry;
ASSERT_EQ(FILE_ERROR_NOT_FOUND,
@@ -182,7 +182,7 @@
EXPECT_EQ(1U, delegate()->get_changed_files().size());
EXPECT_TRUE(delegate()->get_changed_files().count(remote_dest_path));
// The original document got new parent.
- EXPECT_EQ("document:orphan_doc_1", entry.resource_id());
+ EXPECT_EQ("orphan_doc_1", entry.resource_id());
}
TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_NewHostedDocument) {
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc
index 7f52925..456576a 100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -577,7 +577,7 @@
FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1.txt"));
scoped_ptr<ResourceEntry> entry = GetResourceEntrySync(kFilePath);
ASSERT_TRUE(entry);
- EXPECT_EQ("file:subdirectory_file_1_id", entry->resource_id());
+ EXPECT_EQ("subdirectory_file_1_id", entry->resource_id());
EXPECT_EQ(1, fake_drive_service_->about_resource_load_count());
EXPECT_EQ(2, fake_drive_service_->directory_load_count());
@@ -589,7 +589,7 @@
FILE_PATH_LITERAL("drive/root/Document 1 excludeDir-test.gdoc"));
scoped_ptr<ResourceEntry> entry = GetResourceEntrySync(kFilePath);
ASSERT_TRUE(entry);
- EXPECT_EQ("document:5_document_resource_id", entry->resource_id());
+ EXPECT_EQ("5_document_resource_id", entry->resource_id());
}
TEST_F(FileSystemTest, GetNonExistingFile) {
@@ -605,7 +605,7 @@
"Sub Sub Directory Folder"));
scoped_ptr<ResourceEntry> entry = GetResourceEntrySync(kFilePath);
ASSERT_TRUE(entry);
- ASSERT_EQ("folder:sub_sub_directory_folder_id", entry->resource_id());
+ ASSERT_EQ("sub_sub_directory_folder_id", entry->resource_id());
}
TEST_F(FileSystemTest, GetOrphanFile) {
@@ -616,7 +616,7 @@
FILE_PATH_LITERAL("drive/other/Orphan File 1.txt"));
scoped_ptr<ResourceEntry> entry = GetResourceEntrySync(kFilePath);
ASSERT_TRUE(entry);
- EXPECT_EQ("file:1_orphanfile_resource_id", entry->resource_id());
+ EXPECT_EQ("1_orphanfile_resource_id", entry->resource_id());
}
TEST_F(FileSystemTest, ReadDirectory_Root) {
diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
index 6419dc52..4bff5d0c 100644
--- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
@@ -359,7 +359,7 @@
scoped_ptr<google_apis::FileResource> entry;
scheduler_->GetFileResource(
- "file:2_file_resource_id", // resource ID
+ "2_file_resource_id", // resource ID
ClientContext(USER_INITIATED),
google_apis::test_util::CreateCopyResultCallback(&error, &entry));
base::RunLoop().RunUntilIdle();
@@ -375,7 +375,7 @@
GURL share_url;
scheduler_->GetShareUrl(
- "file:2_file_resource_id", // resource ID
+ "2_file_resource_id", // resource ID
GURL("chrome-extension://test-id/"), // embed origin
ClientContext(USER_INITIATED),
google_apis::test_util::CreateCopyResultCallback(&error, &share_url));
@@ -391,7 +391,7 @@
google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
scheduler_->TrashResource(
- "file:2_file_resource_id",
+ "2_file_resource_id",
ClientContext(USER_INITIATED),
google_apis::test_util::CreateCopyResultCallback(&error));
base::RunLoop().RunUntilIdle();
@@ -406,8 +406,8 @@
scoped_ptr<google_apis::FileResource> entry;
scheduler_->CopyResource(
- "file:2_file_resource_id", // resource ID
- "folder:1_folder_resource_id", // parent resource ID
+ "2_file_resource_id", // resource ID
+ "1_folder_resource_id", // parent resource ID
"New Document", // new title
base::Time(),
google_apis::test_util::CreateCopyResultCallback(&error, &entry));
@@ -424,8 +424,8 @@
scoped_ptr<google_apis::FileResource> entry;
scheduler_->UpdateResource(
- "file:2_file_resource_id", // resource ID
- "folder:1_folder_resource_id", // parent resource ID
+ "2_file_resource_id", // resource ID
+ "1_folder_resource_id", // parent resource ID
"New Document", // new title
base::Time(),
base::Time(),
@@ -443,7 +443,7 @@
google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
scheduler_->RenameResource(
- "file:2_file_resource_id",
+ "2_file_resource_id",
"New Title",
google_apis::test_util::CreateCopyResultCallback(&error));
base::RunLoop().RunUntilIdle();
@@ -457,8 +457,8 @@
google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
scheduler_->AddResourceToDirectory(
- "folder:1_folder_resource_id",
- "file:2_file_resource_id",
+ "1_folder_resource_id",
+ "2_file_resource_id",
google_apis::test_util::CreateCopyResultCallback(&error));
base::RunLoop().RunUntilIdle();
@@ -471,8 +471,8 @@
google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
scheduler_->RemoveResourceFromDirectory(
- "folder:1_folder_resource_id",
- "file:subdirectory_file_1_id", // resource ID
+ "1_folder_resource_id",
+ "subdirectory_file_1_id", // resource ID
ClientContext(USER_INITIATED),
google_apis::test_util::CreateCopyResultCallback(&error));
base::RunLoop().RunUntilIdle();
@@ -504,7 +504,7 @@
google_apis::GDataErrorCode error_dontcare = google_apis::GDATA_OTHER_ERROR;
scoped_ptr<google_apis::FileResource> entry_dontcare;
for (int i = 0; i < GetMetadataQueueMaxJobCount(); ++i) {
- std::string resource_id("file:2_file_resource_id");
+ std::string resource_id("2_file_resource_id");
scheduler_->GetFileResource(
resource_id,
ClientContext(USER_INITIATED),
@@ -556,7 +556,7 @@
TEST_F(JobSchedulerTest, NoConnectionUserInitiated) {
ConnectToNone();
- std::string resource_id("file:2_file_resource_id");
+ std::string resource_id("2_file_resource_id");
google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
scoped_ptr<google_apis::FileResource> entry;
@@ -572,7 +572,7 @@
TEST_F(JobSchedulerTest, NoConnectionBackground) {
ConnectToNone();
- std::string resource_id("file:2_file_resource_id");
+ std::string resource_id("2_file_resource_id");
google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
scoped_ptr<google_apis::FileResource> entry;
@@ -611,7 +611,7 @@
base::FilePath::FromUTF8Unsafe("drive/whatever.txt"), // virtual path
kDummyDownloadFileSize,
kOutputFilePath,
- "file:2_file_resource_id",
+ "2_file_resource_id",
ClientContext(BACKGROUND),
google_apis::test_util::CreateCopyResultCallback(
&download_error, &output_file_path),
@@ -664,7 +664,7 @@
base::FilePath::FromUTF8Unsafe("drive/whatever.txt"), // virtual path
kDummyDownloadFileSize,
kOutputFilePath,
- "file:2_file_resource_id",
+ "2_file_resource_id",
ClientContext(BACKGROUND),
google_apis::test_util::CreateCopyResultCallback(
&download_error, &output_file_path),
@@ -717,7 +717,7 @@
base::FilePath::FromUTF8Unsafe("drive/whatever.txt"), // virtual path
kDummyDownloadFileSize,
kOutputFilePath,
- "file:2_file_resource_id",
+ "2_file_resource_id",
ClientContext(BACKGROUND),
google_apis::test_util::CreateCopyResultCallback(
&download_error, &output_file_path),
@@ -762,7 +762,7 @@
base::FilePath::FromUTF8Unsafe("drive/whatever.txt"), // virtual path
kDummyDownloadFileSize,
kOutputFilePath,
- "file:2_file_resource_id",
+ "2_file_resource_id",
ClientContext(BACKGROUND),
google_apis::test_util::CreateCopyResultCallback(
&download_error, &output_file_path),
@@ -821,7 +821,7 @@
&error, &about_resource));
expected_types.insert(TYPE_RENAME_RESOURCE);
scheduler_->RenameResource(
- "file:2_file_resource_id",
+ "2_file_resource_id",
"New Title",
google_apis::test_util::CreateCopyResultCallback(&error));
expected_types.insert(TYPE_DOWNLOAD_FILE);
@@ -829,7 +829,7 @@
base::FilePath::FromUTF8Unsafe("drive/whatever.txt"), // virtual path
kDummyDownloadFileSize,
temp_dir.path().AppendASCII("whatever.txt"),
- "file:2_file_resource_id",
+ "2_file_resource_id",
ClientContext(BACKGROUND),
google_apis::test_util::CreateCopyResultCallback(&error, &path),
google_apis::GetContentCallback());
@@ -848,12 +848,12 @@
// Add more jobs.
expected_types.insert(TYPE_ADD_RESOURCE_TO_DIRECTORY);
scheduler_->AddResourceToDirectory(
- "folder:1_folder_resource_id",
- "file:2_file_resource_id",
+ "1_folder_resource_id",
+ "2_file_resource_id",
google_apis::test_util::CreateCopyResultCallback(&error));
expected_types.insert(TYPE_COPY_RESOURCE);
scheduler_->CopyResource(
- "document:5_document_resource_id",
+ "5_document_resource_id",
fake_drive_service_->GetRootResourceId(),
"New Document",
base::Time(), // last_modified
@@ -926,7 +926,7 @@
base::FilePath::FromUTF8Unsafe("drive/whatever.txt"), // virtual path
kDummyDownloadFileSize,
temp_dir.path().AppendASCII("whatever.txt"),
- "file:2_file_resource_id",
+ "2_file_resource_id",
ClientContext(BACKGROUND),
google_apis::test_util::CreateCopyResultCallback(&error, &path),
google_apis::GetContentCallback());
diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
index 9f96e68b..440aed9 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
@@ -540,7 +540,7 @@
// Confirm that a non existing file is not found.
EXPECT_EQ(FILE_ERROR_NOT_FOUND, resource_metadata_->GetResourceEntryById(
- "file:non_existing", &entry));
+ "non_existing", &entry));
}
TEST_F(ResourceMetadataTest, Iterate) {
diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
index f271e1a..54d77ddb 100644
--- a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
@@ -195,7 +195,7 @@
TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdate) {
const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/File 1.txt"));
- const std::string kResourceId("file:2_file_resource_id");
+ const std::string kResourceId("2_file_resource_id");
const std::string local_id = GetLocalId(kFilePath);
EXPECT_FALSE(local_id.empty());
@@ -239,7 +239,7 @@
TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdateMd5Check) {
const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/File 1.txt"));
- const std::string kResourceId("file:2_file_resource_id");
+ const std::string kResourceId("2_file_resource_id");
const std::string local_id = GetLocalId(kFilePath);
EXPECT_FALSE(local_id.empty());
@@ -317,7 +317,7 @@
TEST_F(EntryUpdatePerformerTest, UpdateEntry_OpenedForWrite) {
const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/File 1.txt"));
- const std::string kResourceId("file:2_file_resource_id");
+ const std::string kResourceId("2_file_resource_id");
const std::string local_id = GetLocalId(kFilePath);
EXPECT_FALSE(local_id.empty());
