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

chrome/browser/chromeos/extensions/external_filesystem_apitest.cc

Index: chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
index eaded3e7084b8807a016c872edecfc7c51a5c17e..290688a3d5c14b5fd4dc377f410fac5633ef3371 100644
--- a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
@@ -19,7 +19,6 @@
 #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"
@@ -205,12 +204,6 @@ class RemoteFileSystemExtensionApiTest : public ExtensionApiTest {
 
     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_);
@@ -228,7 +221,6 @@ class RemoteFileSystemExtensionApiTest : public ExtensionApiTest {
  protected:
   ScopedTempDir test_cache_root_;
   gdata::MockDriveService* mock_drive_service_;
-  scoped_ptr<gdata::OperationRegistry> operation_registry_;
 };
 
 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, LocalFileSystem) {