Make DriveFeedProcessor asynchronous.

chrome/browser/chromeos/drive/drive_file_system_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/drive_file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 1008 matching lines @@
                              ++latest_changelog));
   EXPECT_TRUE(
       EntryExists(FilePath(FILE_PATH_LITERAL("drive/Added file.gdoc"))));
 
   ASSERT_TRUE(LoadChangeFeed("gdata/delta_file_deleted_in_root.json",
                              ++latest_changelog));
   EXPECT_FALSE(
       EntryExists(FilePath(FILE_PATH_LITERAL("drive/Added file.gdoc"))));
 }
 
-
 TEST_F(DriveFileSystemTest, ChangeFeed_AddAndDeleteFileFromExistingDirectory) {
   int latest_changelog = 0;
   ASSERT_TRUE(LoadRootFeedDocument("gdata/root_feed.json"));
 
   EXPECT_TRUE(EntryExists(FilePath(
       FILE_PATH_LITERAL("drive/Directory 1"))));
 
   // Add file to an existing directory.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
+  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
+      FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder")))))
+      .Times(1);
+  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
+      FILE_PATH_LITERAL(
+          "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")))))
+      .Times(1);
   ASSERT_TRUE(LoadChangeFeed("gdata/delta_file_added_in_directory.json",
                              ++latest_changelog));
   EXPECT_TRUE(EntryExists(FilePath(
       FILE_PATH_LITERAL("drive/Directory 1/Added file.gdoc"))));
 
   // Remove that file from the directory.
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   ASSERT_TRUE(LoadChangeFeed("gdata/delta_file_deleted_in_directory.json",
                              ++latest_changelog));
@@ skipping 18 matching lines @@
   EXPECT_TRUE(EntryExists(FilePath(
       FILE_PATH_LITERAL("drive/New Directory"))));
   EXPECT_TRUE(EntryExists(FilePath(
       FILE_PATH_LITERAL("drive/New Directory/File in new dir.gdoc"))));
 }
 
 TEST_F(DriveFileSystemTest, ChangeFeed_AddFileToNewButDeletedDirectory) {
   int latest_changelog = 0;
   ASSERT_TRUE(LoadRootFeedDocument("gdata/root_feed.json"));
 
-  // This feed contains thw following updates:
+  // This feed contains the following updates:
   // 1) A new PDF file is added to a new directory
   // 2) but the new directory is marked "deleted" (i.e. moved to Trash)
   // Hence, the PDF file should be just ignored.
   ASSERT_TRUE(LoadChangeFeed(
       "gdata/delta_file_added_in_new_but_deleted_directory.json",
       ++latest_changelog));
 }
 
 TEST_F(DriveFileSystemTest, ChangeFeed_DirectoryMovedFromRootToDirectory) {
   int latest_changelog = 0;
@@ skipping 13 matching lines @@
   // This will move "Directory 1" from "drive/" to "drive/Directory 2/".
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 2"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 2/Directory 1")))))
       .Times(1);
+  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
+      FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder")))))
+      .Times(1);
+  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
+      FILE_PATH_LITERAL(
+          "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")))))
+      .Times(1);
   ASSERT_TRUE(LoadChangeFeed(
       "gdata/delta_dir_moved_from_root_to_directory.json",
       ++latest_changelog));
 
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 2"))));
   EXPECT_FALSE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1"))));
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 2/Directory 1"))));
@@ skipping 16 matching lines @@
       "drive/Directory 1/Sub Directory Folder"))));
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"))));
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1/SubDirectory File 1.txt"))));
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
+  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
+      FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder")))))
+      .Times(1);
+  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
+      FILE_PATH_LITERAL(
+          "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")))))
+      .Times(1);
   ASSERT_TRUE(LoadChangeFeed(
       "gdata/delta_file_moved_from_directory_to_root.json",
       ++latest_changelog));
 
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1"))));
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1/Sub Directory Folder"))));
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"))));
   EXPECT_FALSE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1/SubDirectory File 1.txt"))));
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/SubDirectory File 1.txt"))));
 }
 
 TEST_F(DriveFileSystemTest, ChangeFeed_FileRenamedInDirectory) {
   int latest_changelog = 0;
   ASSERT_TRUE(LoadRootFeedDocument("gdata/root_feed.json"));
 
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1"))));
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1/SubDirectory File 1.txt"))));
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
+  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
+      FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder")))))
+      .Times(1);
+  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
+      FILE_PATH_LITERAL(
+          "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")))))
+      .Times(1);
   ASSERT_TRUE(LoadChangeFeed("gdata/delta_file_renamed_in_directory.json",
                              ++latest_changelog));
 
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1"))));
   EXPECT_FALSE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1/SubDirectory File 1.txt"))));
   EXPECT_TRUE(EntryExists(FilePath(FILE_PATH_LITERAL(
       "drive/Directory 1/New SubDirectory File 1.txt"))));
 }
@@ skipping 1503 matching lines @@
 
   // Try to close the same file twice.
   file_system_->CloseFile(kFileInRoot, close_file_callback);
   message_loop_.Run();
 
   // It must fail.
   EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_);
 }
 
 }   // namespace drive