drive: Rename drive::DriveFileSystemTest to drive::FileSystemTest

drive: Rename drive::DriveFileSystemTest to drive::FileSystemTest

Forgot to rename the test class name. Along the way, fixed minor
issues in comments.

BUG=242121
TEST=none
R=hashimoto@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202358

[satorux1, 2013-05-23 00:50:59]

one cleanup patch a day.

[hashimoto, 2013-05-23 02:29:16]

lgtm

[commit-bot: I haz the power, 2013-05-23 02:33:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/satorux@chromium.org/15768004/2001

[commit-bot: I haz the power, 2013-05-23 15:10:45]

Failed to apply patch for chrome/browser/chromeos/drive/file_system_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chromeos/drive/file_system_unittest.cc
  Hunk #3 succeeded at 451 (offset -1 lines).
  Hunk #4 succeeded at 475 (offset -1 lines).
  Hunk #5 succeeded at 486 (offset -1 lines).
  Hunk #6 succeeded at 498 (offset -1 lines).
  Hunk #7 succeeded at 521 (offset -1 lines).
  Hunk #8 succeeded at 531 (offset -1 lines).
  Hunk #9 succeeded at 539 (offset -1 lines).
  Hunk #10 succeeded at 565 (offset -1 lines).
  Hunk #11 succeeded at 588 (offset -1 lines).
  Hunk #12 succeeded at 599 (offset -1 lines).
  Hunk #13 succeeded at 608 (offset -1 lines).
  Hunk #14 succeeded at 616 (offset -1 lines).
  Hunk #15 succeeded at 644 (offset -1 lines).
  Hunk #16 succeeded at 656 (offset -1 lines).
  Hunk #17 succeeded at 671 (offset -1 lines).
  Hunk #18 succeeded at 700 (offset -1 lines).
  Hunk #19 succeeded at 719 (offset -1 lines).
  Hunk #20 succeeded at 730 (offset -1 lines).
  Hunk #21 succeeded at 778 (offset -1 lines).
  Hunk #22 succeeded at 812 (offset -1 lines).
  Hunk #23 succeeded at 836 (offset -1 lines).
  Hunk #24 succeeded at 855 (offset -1 lines).
  Hunk #25 succeeded at 894 (offset -1 lines).
  Hunk #26 succeeded at 908 (offset -1 lines).
  Hunk #27 succeeded at 919 (offset -1 lines).
  Hunk #28 succeeded at 933 (offset -1 lines).
  Hunk #29 succeeded at 978 (offset -1 lines).
  Hunk #30 succeeded at 1021 (offset -1 lines).
  Hunk #31 succeeded at 1073 (offset -1 lines).
  Hunk #32 succeeded at 1097 (offset -1 lines).
  Hunk #33 succeeded at 1117 (offset -1 lines).
  Hunk #34 succeeded at 1147 (offset -1 lines).
  Hunk #35 succeeded at 1183 (offset -1 lines).
  Hunk #36 succeeded at 1217 (offset -1 lines).
  Hunk #37 succeeded at 1257 (offset -1 lines).
  Hunk #38 succeeded at 1297 (offset -1 lines).
  Hunk #39 succeeded at 1357 (offset -1 lines).
  Hunk #40 succeeded at 1377 (offset -1 lines).
  Hunk #41 succeeded at 1406 (offset -1 lines).
  Hunk #42 succeeded at 1439 (offset -1 lines).
  Hunk #43 succeeded at 1494 (offset -1 lines).
  Hunk #44 succeeded at 1518 (offset -1 lines).
  Hunk #45 succeeded at 1536 (offset -1 lines).
  Hunk #46 succeeded at 1566 (offset -1 lines).
  Hunk #47 succeeded at 1603 (offset -1 lines).
  Hunk #48 succeeded at 1622 (offset -1 lines).
  Hunk #49 succeeded at 1677 (offset -1 lines).
  Hunk #50 succeeded at 1706 (offset -1 lines).
  Hunk #51 succeeded at 1737 (offset -1 lines).
  Hunk #52 succeeded at 1763 (offset -1 lines).
  Hunk #53 succeeded at 1793 (offset -1 lines).
  Hunk #54 succeeded at 1872 (offset -1 lines).
  Hunk #55 succeeded at 1911 (offset -1 lines).
  Hunk #56 succeeded at 1983 (offset -1 lines).
  Hunk #57 succeeded at 2003 (offset -1 lines).
  Hunk #58 succeeded at 2016 (offset -1 lines).
  Hunk #59 succeeded at 2025 (offset -1 lines).
  Hunk #60 succeeded at 2053 (offset -1 lines).
  Hunk #61 succeeded at 2064 (offset -1 lines).
  Hunk #62 succeeded at 2080 (offset -1 lines).
  Hunk #63 succeeded at 2092 (offset -1 lines).
  Hunk #64 succeeded at 2107 (offset -1 lines).
  Hunk #65 succeeded at 2198 (offset -1 lines).
  Hunk #66 FAILED at 2259.
  1 out of 66 hunks FAILED -- saving rejects to file
chrome/browser/chromeos/drive/file_system_unittest.cc.rej

Patch:       chrome/browser/chromeos/drive/file_system_unittest.cc
Index: chrome/browser/chromeos/drive/file_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc
b/chrome/browser/chromeos/drive/file_system_unittest.cc
index
e818461bb4de946129ab1a395532de8367b94dce..b6270539b5857db8ecd6325b4f5ea04701a188ea
100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -51,7 +51,7 @@ struct SearchResultPair {
 
 // Callback to FileSystem::Search used in ContentSearch tests.
 // Verifies returned vector of results and next feed url.
-void DriveSearchCallback(
+void VerifySearchResult(
     MessageLoop* message_loop,
     const SearchResultPair* expected_results,
     size_t expected_results_size,
@@ -111,9 +111,9 @@ void AppendContent(std::vector<std::string>* buffer,
 
 }  // namespace
 
-class DriveFileSystemTest : public testing::Test {
+class FileSystemTest : public testing::Test {
  protected:
-  DriveFileSystemTest()
+  FileSystemTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         // |root_feed_changestamp_| should be set to the largest changestamp in
         // about resource feed. But we fake it by some non-zero positive
@@ -452,7 +452,7 @@ class DriveFileSystemTest : public testing::Test {
   int root_feed_changestamp_;
 };
 
-TEST_F(DriveFileSystemTest, DuplicatedAsyncInitialization) {
+TEST_F(FileSystemTest, DuplicatedAsyncInitialization) {
   // "Fast fetch" will fire an OnirectoryChanged event.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
@@ -476,7 +476,7 @@ TEST_F(DriveFileSystemTest, DuplicatedAsyncInitialization) {
   EXPECT_EQ(2, fake_drive_service_->about_resource_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetGrandRootEntry) {
+TEST_F(FileSystemTest, GetGrandRootEntry) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   ASSERT_TRUE(entry);
@@ -487,7 +487,7 @@ TEST_F(DriveFileSystemTest, GetGrandRootEntry) {
   EXPECT_EQ(0, fake_drive_service_->resource_list_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetOtherDirEntry) {
+TEST_F(FileSystemTest, GetOtherDirEntry) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/other"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   ASSERT_TRUE(entry);
@@ -499,7 +499,7 @@ TEST_F(DriveFileSystemTest, GetOtherDirEntry) {
   EXPECT_EQ(0, fake_drive_service_->resource_list_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetMyDriveRoot) {
+TEST_F(FileSystemTest, GetMyDriveRoot) {
   // "Fast fetch" will fire an OnirectoryChanged event.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
@@ -522,7 +522,7 @@ TEST_F(DriveFileSystemTest, GetMyDriveRoot) {
   EXPECT_EQ(1, fake_drive_service_->resource_list_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetExistingFile) {
+TEST_F(FileSystemTest, GetExistingFile) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   ASSERT_TRUE(entry);
@@ -532,7 +532,7 @@ TEST_F(DriveFileSystemTest, GetExistingFile) {
   EXPECT_EQ(1, fake_drive_service_->resource_list_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetExistingDocument) {
+TEST_F(FileSystemTest, GetExistingDocument) {
   const base::FilePath kFilePath(
       FILE_PATH_LITERAL("drive/root/Document 1 excludeDir-test.gdoc"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
@@ -540,14 +540,14 @@ TEST_F(DriveFileSystemTest, GetExistingDocument) {
   EXPECT_EQ("document:5_document_resource_id", entry->resource_id());
 }
 
-TEST_F(DriveFileSystemTest, GetNonExistingFile) {
+TEST_F(FileSystemTest, GetNonExistingFile) {
   const base::FilePath kFilePath(
       FILE_PATH_LITERAL("drive/root/nonexisting.file"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   EXPECT_FALSE(entry);
 }
 
-TEST_F(DriveFileSystemTest, GetEncodedFileNames) {
+TEST_F(FileSystemTest, GetEncodedFileNames) {
   const base::FilePath kFilePath1(
       FILE_PATH_LITERAL("drive/root/Slash / in file 1.txt"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath1);
@@ -566,7 +566,7 @@ TEST_F(DriveFileSystemTest, GetEncodedFileNames) {
   EXPECT_EQ("file:slash_subdir_file", entry->resource_id());
 }
 
-TEST_F(DriveFileSystemTest, GetDuplicateNames) {
+TEST_F(FileSystemTest, GetDuplicateNames) {
   const base::FilePath kFilePath1(
       FILE_PATH_LITERAL("drive/root/Duplicate Name.txt"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath1);
@@ -589,7 +589,7 @@ TEST_F(DriveFileSystemTest, GetDuplicateNames) {
               file4_resource_id == resource_id2);
 }
 
-TEST_F(DriveFileSystemTest, GetExistingDirectory) {
+TEST_F(FileSystemTest, GetExistingDirectory) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/Directory 1"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   ASSERT_TRUE(entry);
@@ -600,7 +600,7 @@ TEST_F(DriveFileSystemTest, GetExistingDirectory) {
             entry->directory_specific_info().changestamp());
 }
 
-TEST_F(DriveFileSystemTest, GetInSubSubdir) {
+TEST_F(FileSystemTest, GetInSubSubdir) {
   const base::FilePath kFilePath(
       FILE_PATH_LITERAL("drive/root/Directory 1/Sub Directory Folder/"
                         "Sub Sub Directory Folder"));
@@ -609,7 +609,7 @@ TEST_F(DriveFileSystemTest, GetInSubSubdir) {
   ASSERT_EQ("folder:sub_sub_directory_folder_id", entry->resource_id());
 }
 
-TEST_F(DriveFileSystemTest, GetOrphanFile) {
+TEST_F(FileSystemTest, GetOrphanFile) {
   const base::FilePath kFilePath(
       FILE_PATH_LITERAL("drive/other/Orphan File 1.txt"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
@@ -617,7 +617,7 @@ TEST_F(DriveFileSystemTest, GetOrphanFile) {
   EXPECT_EQ("file:1_orphanfile_resource_id", entry->resource_id());
 }
 
-TEST_F(DriveFileSystemTest, ReadDirectoryByPath_Root) {
+TEST_F(FileSystemTest, ReadDirectoryByPath_Root) {
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
 
@@ -645,7 +645,7 @@ TEST_F(DriveFileSystemTest, ReadDirectoryByPath_Root) {
   EXPECT_TRUE(found_my_drive);
 }
 
-TEST_F(DriveFileSystemTest, ReadDirectoryByPath_NonRootDirectory) {
+TEST_F(Fi…
(message too large)

[commit-bot: I haz the power, 2013-05-24 07:49:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/satorux@chromium.org/15768004/20001

[commit-bot: I haz the power, 2013-05-24 12:35:25]

Failed to apply patch for chrome/browser/chromeos/drive/file_system_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chromeos/drive/file_system_unittest.cc
  Hunk #35 FAILED at 1183.
  Hunk #36 FAILED at 1217.
  Hunk #37 FAILED at 1257.
  Hunk #38 FAILED at 1297.
  Hunk #39 FAILED at 1357.
  Hunk #40 FAILED at 1377.
  Hunk #41 FAILED at 1406.
  Hunk #42 succeeded at 1183 (offset -256 lines).
  Hunk #43 succeeded at 1238 (offset -256 lines).
  Hunk #44 succeeded at 1262 (offset -256 lines).
  Hunk #45 succeeded at 1280 (offset -256 lines).
  Hunk #46 succeeded at 1310 (offset -256 lines).
  Hunk #47 succeeded at 1347 (offset -256 lines).
  Hunk #48 succeeded at 1366 (offset -256 lines).
  Hunk #49 succeeded at 1421 (offset -256 lines).
  Hunk #50 succeeded at 1450 (offset -256 lines).
  Hunk #51 succeeded at 1481 (offset -256 lines).
  Hunk #52 succeeded at 1507 (offset -256 lines).
  Hunk #53 succeeded at 1537 (offset -256 lines).
  Hunk #54 succeeded at 1616 (offset -256 lines).
  Hunk #55 succeeded at 1655 (offset -256 lines).
  Hunk #56 succeeded at 1727 (offset -256 lines).
  Hunk #57 succeeded at 1747 (offset -256 lines).
  Hunk #58 succeeded at 1760 (offset -256 lines).
  Hunk #59 succeeded at 1769 (offset -256 lines).
  Hunk #60 succeeded at 1797 (offset -256 lines).
  Hunk #61 succeeded at 1808 (offset -256 lines).
  Hunk #62 succeeded at 1824 (offset -256 lines).
  Hunk #63 succeeded at 1836 (offset -256 lines).
  Hunk #64 succeeded at 1851 (offset -256 lines).
  Hunk #65 succeeded at 1942 (offset -256 lines).
  7 out of 65 hunks FAILED -- saving rejects to file
chrome/browser/chromeos/drive/file_system_unittest.cc.rej

Patch:       chrome/browser/chromeos/drive/file_system_unittest.cc
Index: chrome/browser/chromeos/drive/file_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc
b/chrome/browser/chromeos/drive/file_system_unittest.cc
index
ab373949b3f092e039da1ad92a98648acc800e8d..0577bd5ef7d5ab65a40657ff7d7123e6f0faa0a5
100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -51,7 +51,7 @@ struct SearchResultPair {
 
 // Callback to FileSystem::Search used in ContentSearch tests.
 // Verifies returned vector of results and next feed url.
-void DriveSearchCallback(
+void VerifySearchResult(
     MessageLoop* message_loop,
     const SearchResultPair* expected_results,
     size_t expected_results_size,
@@ -111,9 +111,9 @@ void AppendContent(std::vector<std::string>* buffer,
 
 }  // namespace
 
-class DriveFileSystemTest : public testing::Test {
+class FileSystemTest : public testing::Test {
  protected:
-  DriveFileSystemTest()
+  FileSystemTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         // |root_feed_changestamp_| should be set to the largest changestamp in
         // about resource feed. But we fake it by some non-zero positive
@@ -451,7 +451,7 @@ class DriveFileSystemTest : public testing::Test {
   int root_feed_changestamp_;
 };
 
-TEST_F(DriveFileSystemTest, DuplicatedAsyncInitialization) {
+TEST_F(FileSystemTest, DuplicatedAsyncInitialization) {
   // "Fast fetch" will fire an OnirectoryChanged event.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
@@ -475,7 +475,7 @@ TEST_F(DriveFileSystemTest, DuplicatedAsyncInitialization) {
   EXPECT_EQ(2, fake_drive_service_->about_resource_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetGrandRootEntry) {
+TEST_F(FileSystemTest, GetGrandRootEntry) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   ASSERT_TRUE(entry);
@@ -486,7 +486,7 @@ TEST_F(DriveFileSystemTest, GetGrandRootEntry) {
   EXPECT_EQ(0, fake_drive_service_->resource_list_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetOtherDirEntry) {
+TEST_F(FileSystemTest, GetOtherDirEntry) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/other"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   ASSERT_TRUE(entry);
@@ -498,7 +498,7 @@ TEST_F(DriveFileSystemTest, GetOtherDirEntry) {
   EXPECT_EQ(0, fake_drive_service_->resource_list_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetMyDriveRoot) {
+TEST_F(FileSystemTest, GetMyDriveRoot) {
   // "Fast fetch" will fire an OnirectoryChanged event.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
@@ -521,7 +521,7 @@ TEST_F(DriveFileSystemTest, GetMyDriveRoot) {
   EXPECT_EQ(1, fake_drive_service_->resource_list_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetExistingFile) {
+TEST_F(FileSystemTest, GetExistingFile) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   ASSERT_TRUE(entry);
@@ -531,7 +531,7 @@ TEST_F(DriveFileSystemTest, GetExistingFile) {
   EXPECT_EQ(1, fake_drive_service_->resource_list_load_count());
 }
 
-TEST_F(DriveFileSystemTest, GetExistingDocument) {
+TEST_F(FileSystemTest, GetExistingDocument) {
   const base::FilePath kFilePath(
       FILE_PATH_LITERAL("drive/root/Document 1 excludeDir-test.gdoc"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
@@ -539,14 +539,14 @@ TEST_F(DriveFileSystemTest, GetExistingDocument) {
   EXPECT_EQ("document:5_document_resource_id", entry->resource_id());
 }
 
-TEST_F(DriveFileSystemTest, GetNonExistingFile) {
+TEST_F(FileSystemTest, GetNonExistingFile) {
   const base::FilePath kFilePath(
       FILE_PATH_LITERAL("drive/root/nonexisting.file"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   EXPECT_FALSE(entry);
 }
 
-TEST_F(DriveFileSystemTest, GetEncodedFileNames) {
+TEST_F(FileSystemTest, GetEncodedFileNames) {
   const base::FilePath kFilePath1(
       FILE_PATH_LITERAL("drive/root/Slash / in file 1.txt"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath1);
@@ -565,7 +565,7 @@ TEST_F(DriveFileSystemTest, GetEncodedFileNames) {
   EXPECT_EQ("file:slash_subdir_file", entry->resource_id());
 }
 
-TEST_F(DriveFileSystemTest, GetDuplicateNames) {
+TEST_F(FileSystemTest, GetDuplicateNames) {
   const base::FilePath kFilePath1(
       FILE_PATH_LITERAL("drive/root/Duplicate Name.txt"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath1);
@@ -588,7 +588,7 @@ TEST_F(DriveFileSystemTest, GetDuplicateNames) {
               file4_resource_id == resource_id2);
 }
 
-TEST_F(DriveFileSystemTest, GetExistingDirectory) {
+TEST_F(FileSystemTest, GetExistingDirectory) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/Directory 1"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
   ASSERT_TRUE(entry);
@@ -599,7 +599,7 @@ TEST_F(DriveFileSystemTest, GetExistingDirectory) {
             entry->directory_specific_info().changestamp());
 }
 
-TEST_F(DriveFileSystemTest, GetInSubSubdir) {
+TEST_F(FileSystemTest, GetInSubSubdir) {
   const base::FilePath kFilePath(
       FILE_PATH_LITERAL("drive/root/Directory 1/Sub Directory Folder/"
                         "Sub Sub Directory Folder"));
@@ -608,7 +608,7 @@ TEST_F(DriveFileSystemTest, GetInSubSubdir) {
   ASSERT_EQ("folder:sub_sub_directory_folder_id", entry->resource_id());
 }
 
-TEST_F(DriveFileSystemTest, GetOrphanFile) {
+TEST_F(FileSystemTest, GetOrphanFile) {
   const base::FilePath kFilePath(
       FILE_PATH_LITERAL("drive/other/Orphan File 1.txt"));
   scoped_ptr<ResourceEntry> entry = GetResourceEntryByPathSync(kFilePath);
@@ -616,7 +616,7 @@ TEST_F(DriveFileSystemTest, GetOrphanFile) {
   EXPECT_EQ("file:1_orphanfile_resource_id", entry->resource_id());
 }
 
-TEST_F(DriveFileSystemTest, ReadDirectoryByPath_Root) {
+TEST_F(FileSystemTest, ReadDirectoryByPath_Root) {
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
 
@@ -644,7 +644,7 @@ TEST_F(DriveFileSystemTest, ReadDirectoryByPath_Root) {
   EXPECT_TRUE(found_my_drive);
 }
 
-TEST_F(DriveFileSystemTest, ReadDirectoryByPath_NonRootDirectory) {
+TEST_F(FileSystemTest, ReadDirectoryByPath_NonRootDirectory) {
   // ReadDirectoryByPath() should kick off the resource list loading.
   scoped_ptr<ResourceEntryVector> entries(
       ReadDirectoryByPathSync(
@@ -656,7 +656,7 @@ TEST_F(DriveFileSystemTest,
ReadDirectoryByPath_NonRootDirectory) {
   EXPECT_EQ(3U, entries->size());
 }
 
-TEST_F(DriveFileSystemTest, ChangeFeed_AddAndDeleteFileInRoot) {
+TEST_F(FileSystemTest, ChangeFeed_AddAndDeleteFileInRoot) {
   ASSERT_TRUE(LoadRootFeedDocument());
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
@@ -671,7 +671,7 @@ TEST_F(DriveFileSystemTest,
ChangeFeed_AddAndDeleteFileInRoot) {
       base::FilePath(FILE_PATH_LITERAL("drive/root/Added file.gdoc"))));
 }
 
-TEST_F(DriveFileSystemTest, ChangeFeed_AddAndDeleteFileFromExistingDirectory) {
+TEST_F(FileSystemTest, ChangeFeed_AddAndDeleteFileFromExistingDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
 
   EXPECT_TRUE(
@@ -700,7 +700,7 @@ TEST_F(DriveFileSystemTest,
ChangeFeed_AddAndDeleteFileFromExistingDirectory) {
       FILE_PATH_LITERAL("drive/root/Directory 1/Added file.gdoc"))));
 }
 
-TEST_F(DriveFileSystemTest, ChangeFeed_AddFileToNewDirectory) {
+TEST_F(FileSystemTest, ChangeFeed_AddFileToNewDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
   // Add file to a new directory.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
@@ -719,7 +719,7 @@ TEST_F(DriveFileSystemTest,
ChangeFeed_AddFileToNewDirectory) {
       FILE_PATH_LITERAL("drive/root/New Directory/File in new dir.gdoc"))));
 }
 
-TEST_F(DriveFileSystemTest, ChangeFeed_AddFileToNewButDeletedDirectory) {
+TEST_F(F…
(message too large)

[satorux1, 2013-05-27 00:34:40]

Committed patchset #3 manually as r202358 (presubmit successful).