Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / drive / directory_loader_unittest.cc

diff --git a/src/chrome/browser/chromeos/drive/directory_loader_unittest.cc b/src/chrome/browser/chromeos/drive/directory_loader_unittest.cc
index 436aee7..ef4f8da 100644 (file)
--- a/src/chrome/browser/chromeos/drive/directory_loader_unittest.cc
+++ b/src/chrome/browser/chromeos/drive/directory_loader_unittest.cc
@@ -46,8 +46,8 @@ class TestDirectoryLoaderObserver : public ChangeListLoaderObserver {
   void clear_changed_directories() { changed_directories_.clear(); }
 
   // ChageListObserver overrides:
-  virtual void OnDirectoryChanged(
-      const base::FilePath& directory_path) OVERRIDE {
+  virtual void OnDirectoryReloaded(
+      const base::FilePath& directory_path) override {
     changed_directories_.insert(directory_path);
   }
 
@@ -68,7 +68,7 @@ void AccumulateReadDirectoryResult(ResourceEntryVector* out_entries,
 
 class DirectoryLoaderTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     pref_service_.reset(new TestingPrefServiceSimple);
     test_util::RegisterDrivePrefs(pref_service_->registry());
@@ -86,16 +86,17 @@ class DirectoryLoaderTest : public testing::Test {
         temp_dir_.path(), base::MessageLoopProxy::current().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
-    metadata_.reset(new ResourceMetadata(
-        metadata_storage_.get(), base::MessageLoopProxy::current().get()));
-    ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
-
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
                                base::MessageLoopProxy::current().get(),
                                NULL /* free_disk_space_getter */));
     ASSERT_TRUE(cache_->Initialize());
 
+    metadata_.reset(new ResourceMetadata(
+        metadata_storage_.get(), cache_.get(),
+        base::MessageLoopProxy::current().get()));
+    ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
+
     about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
     loader_controller_.reset(new LoaderController);
     directory_loader_.reset(
@@ -108,9 +109,9 @@ class DirectoryLoaderTest : public testing::Test {
   }
 
   // Adds a new file to the root directory of the service.
-  scoped_ptr<google_apis::ResourceEntry> AddNewFile(const std::string& title) {
+  scoped_ptr<google_apis::FileResource> AddNewFile(const std::string& title) {
     google_apis::GDataErrorCode error = google_apis::GDATA_FILE_ERROR;
-    scoped_ptr<google_apis::ResourceEntry> entry;
+    scoped_ptr<google_apis::FileResource> entry;
     drive_service_->AddNewFile(
         "text/plain",
         "content text",
@@ -131,8 +132,8 @@ class DirectoryLoaderTest : public testing::Test {
   scoped_ptr<JobScheduler> scheduler_;
   scoped_ptr<ResourceMetadataStorage,
              test_util::DestroyHelperForTests> metadata_storage_;
-  scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> metadata_;
   scoped_ptr<FileCache, test_util::DestroyHelperForTests> cache_;
+  scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> metadata_;
   scoped_ptr<AboutResourceLoader> about_resource_loader_;
   scoped_ptr<LoaderController> loader_controller_;
   scoped_ptr<DirectoryLoader> directory_loader_;