Files.app: Provide detailed change information on onDirectoryChanged event

chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc

 // Copyright 2013 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/sync/entry_revert_performer.h"
 
 #include "base/task_runner_util.h"
+#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace drive {
 namespace internal {
 
 class EntryRevertPerformerTest : public file_system::OperationTestBase {
  protected:
   virtual void SetUp() OVERRIDE {
    OperationTestBase::SetUp();
    performer_.reset(new EntryRevertPerformer(blocking_task_runner(),
                                              observer(),
                                              scheduler(),
                                              metadata()));
   }
 
   scoped_ptr<EntryRevertPerformer> performer_;
 };
 
 TEST_F(EntryRevertPerformerTest, RevertEntry) {
   base::FilePath path(
       FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1.txt"));
+  base::FilePath updated_path(FILE_PATH_LITERAL(
+      "drive/root/Directory 1/UpdatedSubDirectory File 1.txt"));
 
   ResourceEntry src_entry;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(path, &src_entry));
 
   // Update local entry.
   ResourceEntry updated_entry = src_entry;
   updated_entry.set_title("Updated" + src_entry.title());
   updated_entry.set_metadata_edit_state(ResourceEntry::DIRTY);
 
   FileError error = FILE_ERROR_FAILED;
@@ skipping 15 matching lines @@
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Verify local change is reverted.
   ResourceEntry result_entry;
   EXPECT_EQ(FILE_ERROR_OK,
             GetLocalResourceEntryById(src_entry.local_id(), &result_entry));
   EXPECT_EQ(src_entry.title(), result_entry.title());
   EXPECT_EQ(ResourceEntry::CLEAN, result_entry.metadata_edit_state());
 
-  EXPECT_EQ(1U, observer()->get_changed_paths().size());
-  EXPECT_TRUE(observer()->get_changed_paths().count(path.DirName()));
+  EXPECT_EQ(2U, observer()->get_changed_files().size());
+  EXPECT_TRUE(observer()->get_changed_files().count(path));
+  EXPECT_TRUE(observer()->get_changed_files().count(updated_path));
 }
 
 TEST_F(EntryRevertPerformerTest, RevertEntry_NotFoundOnServer) {
   ResourceEntry my_drive;
   EXPECT_EQ(FILE_ERROR_OK,
             GetLocalResourceEntry(util::GetDriveMyDriveRootPath(), &my_drive));
 
   // Add a new entry with a nonexistent resource ID.
   ResourceEntry entry;
   entry.set_title("New File.txt");
@@ skipping 16 matching lines @@
   performer_->RevertEntry(
       local_id,
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Verify the entry was deleted locally.
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntryById(local_id, &entry));
 
-  EXPECT_EQ(1U, observer()->get_changed_paths().size());
-  EXPECT_TRUE(observer()->get_changed_paths().count(
+  EXPECT_EQ(1U, observer()->get_changed_files().size());
+  EXPECT_TRUE(observer()->get_changed_files().CountDirectory(
       util::GetDriveMyDriveRootPath()));
 }
 
 TEST_F(EntryRevertPerformerTest, RevertEntry_TrashedOnServer) {
   base::FilePath path(
       FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1.txt"));
 
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(path, &entry));
 
@@ skipping 11 matching lines @@
       entry.local_id(),
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Verify the entry was deleted locally.
   EXPECT_EQ(FILE_ERROR_NOT_FOUND,
             GetLocalResourceEntryById(entry.local_id(), &entry));
 
-  EXPECT_EQ(1U, observer()->get_changed_paths().size());
-  EXPECT_TRUE(observer()->get_changed_paths().count(path.DirName()));
+  EXPECT_EQ(1U, observer()->get_changed_files().size());
+  EXPECT_TRUE(observer()->get_changed_files().count(path));
 }
 
 }  // namespace internal
 }  // namespace drive