Reland "Revert 156830 - drive: Stop exposing operation_registry() from DriveServiceInterface"

chrome/browser/chromeos/extensions/external_filesystem_apitest.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 "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/gdata/drive_file_system.h"
 #include "chrome/browser/chromeos/gdata/drive_system_service.h"
 #include "chrome/browser/chromeos/gdata/mock_drive_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
-#include "chrome/browser/google_apis/operation_registry.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/fileapi/file_system_context.h"
@@ skipping 165 matching lines @@
     // created) because the system service instance is initialized very early
     // by FileBrowserEventRouter.
     FilePath tmp_dir_path;
     PathService::Get(base::DIR_TEMP, &tmp_dir_path);
     ASSERT_TRUE(test_cache_root_.CreateUniqueTempDirUnderPath(tmp_dir_path));
     gdata::DriveSystemServiceFactory::set_cache_root_for_test(
         test_cache_root_.path().value());
 
     mock_drive_service_ = new gdata::MockDriveService();
 
-    operation_registry_.reset(new gdata::OperationRegistry());
-    // FileBrowserEventRouter will add and remove itself from operation registry
-    // observer list.
-    EXPECT_CALL(*mock_drive_service_, operation_registry()).
-        WillRepeatedly(Return(operation_registry_.get()));
-
     // |mock_drive_service_| will eventually get owned by a system service.
     gdata::DriveSystemServiceFactory::set_drive_service_for_test(
         mock_drive_service_);
 
     ExtensionApiTest::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     // Let's make sure we don't leak documents service.
     gdata::DriveSystemServiceFactory::set_drive_service_for_test(NULL);
     gdata::DriveSystemServiceFactory::set_cache_root_for_test(std::string());
     ExtensionApiTest::TearDown();
   }
 
  protected:
   ScopedTempDir test_cache_root_;
   gdata::MockDriveService* mock_drive_service_;
-  scoped_ptr<gdata::OperationRegistry> operation_registry_;
 };
 
 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, LocalFileSystem) {
   AddTmpMountPoint();
   ASSERT_TRUE(RunComponentExtensionTest("local_filesystem")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTest) {
   AddTmpMountPoint();
   ASSERT_TRUE(RunExtensionTest("filesystem_handler")) << message_;
@@ skipping 113 matching lines @@
                            _, _))
       .WillOnce(MockDownloadFileCallback(gdata::HTTP_SUCCESS));
 
   // On exit, all operations in progress should be cancelled.
   EXPECT_CALL(*mock_drive_service_, CancelAll());
 
   // All is set... RUN THE TEST.
   EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html",
       kComponentFlags)) << message_;
 }