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

chrome/browser/chromeos/extensions/file_browser_event_router.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 "chrome/browser/chromeos/extensions/file_browser_event_router.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 95 matching lines @@
   if (!profile_) {
     NOTREACHED();
     return;
   }
   DiskMountManager::GetInstance()->RemoveObserver(this);
 
   DriveSystemService* system_service =
       DriveSystemServiceFactory::FindForProfile(profile_);
   if (system_service) {
     system_service->file_system()->RemoveObserver(this);
-    system_service->drive_service()->operation_registry()->RemoveObserver(this);
+    system_service->drive_service()->RemoveObserver(this);
   }
 
   chromeos::NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   if (network_library)
      network_library->RemoveNetworkManagerObserver(this);
 
   profile_ = NULL;
 }
 
 void FileBrowserEventRouter::ObserveFileSystemEvents() {
   if (!profile_) {
     NOTREACHED();
     return;
   }
   if (!chromeos::UserManager::Get()->IsUserLoggedIn())
     return;
 
   DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
   disk_mount_manager->RemoveObserver(this);
   disk_mount_manager->AddObserver(this);
   disk_mount_manager->RequestMountInfoRefresh();
 
   DriveSystemService* system_service =
       DriveSystemServiceFactory::GetForProfile(profile_);
   if (!system_service) {
     NOTREACHED();
     return;
   }
-  system_service->drive_service()->operation_registry()->AddObserver(this);
+  system_service->drive_service()->AddObserver(this);
   system_service->file_system()->AddObserver(this);
 
   chromeos::NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   if (network_library)
      network_library->AddNetworkManagerObserver(this);
 
   pref_change_registrar_->Init(profile_->GetPrefs());
   pref_change_registrar_->Add(prefs::kDisableGDataOverCellular, this);
   pref_change_registrar_->Add(prefs::kDisableGDataHostedFiles, this);
@@ skipping 248 matching lines @@
         *pref_name == prefs::kDisableGDataHostedFiles ||
         *pref_name == prefs::kDisableGData) {
       profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
           extensions::event_names::kOnFileBrowserGDataPreferencesChanged,
           scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
     }
   }
 }
 
 void FileBrowserEventRouter::OnProgressUpdate(
-    const std::vector<gdata::OperationRegistry::ProgressStatus>& list) {
+    const gdata::OperationProgressStatusList& list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   scoped_ptr<ListValue> event_list(
       file_manager_util::ProgressStatusVectorToListValue(
           profile_,
           file_manager_util::GetFileBrowserExtensionUrl().GetOrigin(),
           list));
 
   scoped_ptr<ListValue> args(new ListValue());
   args->Append(event_list.release());
@@ skipping 434 matching lines @@
   return scoped_refptr<RefcountedProfileKeyedService>(
       new FileBrowserEventRouter(profile));
 }
 
 bool FileBrowserEventRouterFactory::ServiceHasOwnInstanceInIncognito() const {
   // Explicitly and always allow this router in guest login mode.   see
   // chrome/browser/profiles/profile_keyed_base_factory.h comment
   // for the details.
   return true;
 }