Files.app: Provide detailed change information on onDirectoryChanged event

chrome/browser/chromeos/drive/file_system/download_operation_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/file_system/download_operation.h"
 
 #include "base/file_util.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.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/drive/fake_drive_service.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/constants/cryptohome.h"
 
 namespace drive {
 namespace file_system {
@@ skipping 33 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(
           &error, &file_path, &entry));
   test_util::RunBlockingPoolTask();
 
   EXPECT_EQ(FILE_ERROR_OK, error);
   ASSERT_TRUE(entry);
   EXPECT_FALSE(entry->file_specific_info().is_hosted_document());
 
   // The transfered file is cached and the change of "offline available"
   // attribute is notified.
-  EXPECT_EQ(1U, observer()->get_changed_paths().size());
-  EXPECT_EQ(1U, observer()->get_changed_paths().count(file_in_root.DirName()));
+  EXPECT_EQ(1U, observer()->get_changed_files().size());
+  EXPECT_EQ(1U, observer()->get_changed_files().count(file_in_root));
 }
 
 TEST_F(DownloadOperationTest,
        EnsureFileDownloadedByPath_FromServer_NoSpaceAtAll) {
   base::FilePath file_in_root(FILE_PATH_LITERAL("drive/root/File 1.txt"));
 
   // Pretend we have no space at all.
   fake_free_disk_space_getter()->set_default_value(0);
 
   FileError error = FILE_ERROR_OK;
@@ skipping 52 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(
           &error, &file_path, &entry));
   test_util::RunBlockingPoolTask();
 
   EXPECT_EQ(FILE_ERROR_OK, error);
   ASSERT_TRUE(entry);
   EXPECT_FALSE(entry->file_specific_info().is_hosted_document());
 
   // The transfered file is cached and the change of "offline available"
   // attribute is notified.
-  EXPECT_EQ(1U, observer()->get_changed_paths().size());
-  EXPECT_EQ(1U, observer()->get_changed_paths().count(file_in_root.DirName()));
+  EXPECT_EQ(2U, observer()->get_changed_files().size());
+  EXPECT_TRUE(observer()->get_changed_files().count(file_in_root));
+  EXPECT_TRUE(observer()->get_changed_files().count(cached_file));
 
   // The cache for the other file should be removed in order to free up space.
   ResourceEntry cached_file_entry;
   EXPECT_EQ(FILE_ERROR_OK,
             GetLocalResourceEntry(cached_file, &cached_file_entry));
   EXPECT_FALSE(
       cached_file_entry.file_specific_info().cache_state().is_present());
 }
 
 TEST_F(DownloadOperationTest,
@@ skipping 109 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(
           &error, &file_path, &entry));
   test_util::RunBlockingPoolTask();
 
   EXPECT_EQ(FILE_ERROR_OK, error);
   ASSERT_TRUE(entry);
   EXPECT_FALSE(entry->file_specific_info().is_hosted_document());
 
   // The transfered file is cached and the change of "offline available"
   // attribute is notified.
-  EXPECT_EQ(1U, observer()->get_changed_paths().size());
-  EXPECT_EQ(1U, observer()->get_changed_paths().count(file_in_root.DirName()));
+  EXPECT_EQ(1U, observer()->get_changed_files().size());
+  EXPECT_EQ(1U, observer()->get_changed_files().count(file_in_root));
 }
 
 TEST_F(DownloadOperationTest,
        EnsureFileDownloadedByPath_WithGetContentCallback) {
   base::FilePath file_in_root(FILE_PATH_LITERAL("drive/root/File 1.txt"));
 
   {
     FileError initialized_error = FILE_ERROR_FAILED;
     scoped_ptr<ResourceEntry> entry, entry_dontcare;
     base::FilePath local_path, local_path_dontcare;
@@ skipping 15 matching lines @@
     ASSERT_TRUE(entry);
     ASSERT_TRUE(local_path.empty());
     EXPECT_FALSE(cancel_download.is_null());
     // Content is available through the second callback argument.
     EXPECT_EQ(static_cast<size_t>(entry->file_info().size()),
               get_content_callback.GetConcatenatedData().size());
     EXPECT_EQ(FILE_ERROR_OK, completion_error);
 
     // The transfered file is cached and the change of "offline available"
     // attribute is notified.
-    EXPECT_EQ(1U, observer()->get_changed_paths().size());
-    EXPECT_EQ(1U,
-              observer()->get_changed_paths().count(file_in_root.DirName()));
+    EXPECT_EQ(1U, observer()->get_changed_files().size());
+    EXPECT_EQ(1U, observer()->get_changed_files().count(file_in_root));
   }
 
   {
     FileError initialized_error = FILE_ERROR_FAILED;
     scoped_ptr<ResourceEntry> entry, entry_dontcare;
     base::FilePath local_path, local_path_dontcare;
     google_apis::test_util::TestGetContentCallback get_content_callback;
     FileError completion_error = FILE_ERROR_FAILED;
     base::Closure cancel_download = operation_->EnsureFileDownloadedByPath(
         file_in_root,
@@ skipping 175 matching lines @@
   // Cancel immediately.
   ASSERT_FALSE(cancel_closure.is_null());
   cancel_closure.Run();
   test_util::RunBlockingPoolTask();
 
   EXPECT_EQ(FILE_ERROR_ABORT, error);
 }
 
 }  // namespace file_system
 }  // namespace drive