Chromium Code Reviews| Index: chrome/browser/chromeos/drive/drive_file_system_unittest.cc |
| diff --git a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc |
| index b2a59b55bc8ac8b423d91e3612ac0d2f8473c1d6..8ded9e0f813e9ed938aa9be0afb508c226201308 100644 |
| --- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc |
| +++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc |
| @@ -49,6 +49,10 @@ using ::testing::_; |
| namespace drive { |
| namespace { |
| +// The root directory resource ID for WAPI. |
| +// TODO(haruki): Make Drive API equivalent work. http://crbug.com/157114 |
| +const char kWAPIRootDirectoryResourceId[] = "folder:root"; |
|
satorux1
2012/10/23 06:54:50
I think it's better to keep the constant in drive_
kochi
2012/10/23 07:44:35
Done.
|
| + |
| const char kSymLinkToDevNull[] = "/dev/null"; |
| const int64 kLotsOfSpace = kMinFreeSpace * 10; |
| @@ -607,7 +611,7 @@ class DriveFileSystemTest : public testing::Test { |
| DriveEntryProto* dir_base = root_dir->mutable_drive_entry(); |
| PlatformFileInfoProto* platform_info = dir_base->mutable_file_info(); |
| dir_base->set_title("drive"); |
| - dir_base->set_resource_id(kDriveRootDirectoryResourceId); |
| + dir_base->set_resource_id(kWAPIRootDirectoryResourceId); |
| dir_base->set_upload_url("http://resumable-create-media/1"); |
| platform_info->set_is_directory(true); |
| @@ -855,7 +859,7 @@ TEST_F(DriveFileSystemTest, SearchRootDirectory) { |
| scoped_ptr<DriveEntryProto> entry = GetEntryInfoByPathSync( |
| FilePath(FILE_PATH_LITERAL(kFilePath))); |
| ASSERT_TRUE(entry.get()); |
| - EXPECT_EQ(kDriveRootDirectoryResourceId, entry->resource_id()); |
| + EXPECT_EQ(kWAPIRootDirectoryResourceId, entry->resource_id()); |
| } |
| TEST_F(DriveFileSystemTest, SearchExistingFile) { |
| @@ -2516,7 +2520,7 @@ TEST_F(DriveFileSystemTest, RequestDirectoryRefresh) { |
| // We'll fetch documents in the root directory with its resource ID. |
| EXPECT_CALL(*mock_drive_service_, |
| - GetDocuments(Eq(GURL()), _, _, kDriveRootDirectoryResourceId, _)) |
| + GetDocuments(Eq(GURL()), _, _, kWAPIRootDirectoryResourceId, _)) |
| .Times(1); |
| // We'll notify the directory change to the observer. |
| EXPECT_CALL(*mock_directory_observer_, |