Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/chromeos/drive/file_system/operation_test_base.cc b/src/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
index e4a691f..78665a7 100644 (file)
--- a/src/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
+++ b/src/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
@@ -13,7 +13,9 @@
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
+#include "chrome/browser/drive/event_logger.h"
 #include "chrome/browser/drive/fake_drive_service.h"
+#include "chrome/browser/drive/test_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/test_util.h"
 
@@ -62,14 +64,14 @@ void OperationTestBase::SetUp() {
 
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
+  logger_.reset(new EventLogger);
+
   fake_drive_service_.reset(new FakeDriveService);
-  fake_drive_service_->LoadResourceListForWapi(
-      "gdata/root_feed.json");
-  fake_drive_service_->LoadAccountMetadataForWapi(
-      "gdata/account_metadata.json");
+  ASSERT_TRUE(test_util::SetUpTestEntries(fake_drive_service_.get()));
 
   scheduler_.reset(new JobScheduler(
       pref_service_.get(),
+      logger_.get(),
       fake_drive_service_.get(),
       blocking_task_runner_.get()));
 
@@ -114,12 +116,17 @@ void OperationTestBase::SetUp() {
   ASSERT_TRUE(success);
 
   // Makes sure the FakeDriveService's content is loaded to the metadata_.
+  about_resource_loader_.reset(new internal::AboutResourceLoader(
+      scheduler_.get()));
+  loader_controller_.reset(new internal::LoaderController);
   change_list_loader_.reset(new internal::ChangeListLoader(
+      logger_.get(),
       blocking_task_runner_.get(),
       metadata_.get(),
       scheduler_.get(),
-      fake_drive_service_.get()));
-  change_list_loader_->LoadForTesting(
+      about_resource_loader_.get(),
+      loader_controller_.get()));
+  change_list_loader_->LoadIfNeeded(
       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   ASSERT_EQ(FILE_ERROR_OK, error);