| Index: chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc
|
| index 2154bcbf1f35601757f59c7cb209a73fd8186360..be9cbf1d48afd38dbf0f427d360621c7b81bc871 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc
|
| @@ -24,8 +24,8 @@ namespace sync_file_system {
|
|
|
| namespace {
|
|
|
| -const char kSyncRootResourceId[] = "sync_root_resource_id";
|
| -const char kParentResourceId[] = "parent_resource_id";
|
| +const char kSyncRootResourceId[] = "folder:sync_root_resource_id";
|
| +const char kParentResourceId[] = "folder:parent_resource_id";
|
| const char kAppId[] = "app-id";
|
| const char kAppOrigin[] = "chrome-extension://app-id";
|
|
|
| @@ -198,8 +198,19 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
|
| std::pair<iterator, bool> inserted =
|
| resources_.insert(std::make_pair(title, std::string()));
|
| if (inserted.second) {
|
| - inserted.first->second =
|
| - base::StringPrintf("%" PRId64, ++resource_count_);
|
| + switch (type) {
|
| + case SYNC_FILE_TYPE_FILE:
|
| + inserted.first->second =
|
| + base::StringPrintf("file:%" PRId64, ++resource_count_);
|
| + break;
|
| + case SYNC_FILE_TYPE_DIRECTORY:
|
| + inserted.first->second =
|
| + base::StringPrintf("folder:%" PRId64, ++resource_count_);
|
| + break;
|
| + default:
|
| + NOTREACHED();
|
| + break;
|
| + }
|
| }
|
| std::string resource_id = inserted.first->second;
|
| std::string md5_checksum;
|
|
|