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

chrome/browser/chromeos/gdata/gdata_wapi_service.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/gdata/gdata_wapi_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 56 matching lines @@
 }  // namespace
 
 GDataWapiService::GDataWapiService()
     : profile_(NULL),
       runner_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 GDataWapiService::~GDataWapiService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (runner_.get())
+  if (runner_.get()) {
+    runner_->operation_registry()->RemoveObserver(this);
     runner_->auth_service()->RemoveObserver(this);
+  }
 }
 
 AuthService* GDataWapiService::auth_service_for_testing() {
   return runner_->auth_service();
 }
 
 void GDataWapiService::Initialize(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   profile_ = profile;
 
   std::vector<std::string> scopes;
   scopes.push_back(kDocsListScope);
   scopes.push_back(kSpreadsheetsScope);
   scopes.push_back(kUserContentScope);
   // Drive App scope is required for even WAPI v3 apps access.
   scopes.push_back(kDriveAppsScope);
   runner_.reset(new OperationRunner(profile, scopes));
   runner_->Initialize();
 
   runner_->auth_service()->AddObserver(this);
+  runner_->operation_registry()->AddObserver(this);
 }
 
 void GDataWapiService::AddObserver(DriveServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void GDataWapiService::RemoveObserver(DriveServiceObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-OperationRegistry* GDataWapiService::operation_registry() const {
-  return runner_->operation_registry();
-}
-
 bool GDataWapiService::CanStartOperation() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return HasRefreshToken();
 }
 
 void GDataWapiService::CancelAll() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->CancelAll();
 }
 
+bool GDataWapiService::CancelForFilePath(const FilePath& file_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  return operation_registry()->CancelForFilePath(file_path);
+}
+
+OperationProgressStatusList GDataWapiService::GetProgressStatusList() const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  return operation_registry()->GetProgressStatusList();
+}
+
 void GDataWapiService::Authenticate(const AuthStatusCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->Authenticate(callback);
 }
 
 void GDataWapiService::GetDocuments(const GURL& url,
                                     int64 start_changestamp,
                                     const std::string& search_query,
                                     const std::string& directory_resource_id,
                                     const GetDataCallback& callback) {
@@ skipping 173 matching lines @@
 
   return runner_->auth_service()->HasAccessToken();
 }
 
 bool GDataWapiService::HasRefreshToken() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return runner_->auth_service()->HasRefreshToken();
 }
 
+OperationRegistry* GDataWapiService::operation_registry() const {
+  return runner_->operation_registry();
+}
+
 void GDataWapiService::OnOAuth2RefreshTokenChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (CanStartOperation()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnReadyToPerformOperations());
   }
 }
 
+void GDataWapiService::OnProgressUpdate(
+    const OperationProgressStatusList& list) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  FOR_EACH_OBSERVER(
+      DriveServiceObserver, observers_, OnProgressUpdate(list));
+}
+
+void GDataWapiService::OnAuthenticationFailed() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  FOR_EACH_OBSERVER(
+      DriveServiceObserver, observers_, OnAuthenticationFailed());
+}
+
 }  // namespace gdata