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

chrome/browser/chromeos/gdata/gdata_wapi_service.h

Index: chrome/browser/chromeos/gdata/gdata_wapi_service.h
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_service.h b/chrome/browser/chromeos/gdata/gdata_wapi_service.h
index e0085534da085c1c93d50249e4d2293ff56c4b58..53d7084722b2652796395d09f0ade8e80e54e018 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_service.h
+++ b/chrome/browser/chromeos/gdata/gdata_wapi_service.h
@@ -27,7 +27,8 @@ class OperationRunner;
 // Details of API call are abstracted in each operation class and this class
 // works as a thin wrapper for the API.
 class GDataWapiService : public DriveServiceInterface,
-                         public AuthService::Observer {
+                         public AuthService::Observer,
+                         public OperationRegistry::Observer {
  public:
   // Instance is usually created by DriveSystemServiceFactory and owned by
   // DriveFileSystem.
@@ -40,9 +41,10 @@ class GDataWapiService : public DriveServiceInterface,
   virtual void Initialize(Profile* profile) OVERRIDE;
   virtual void AddObserver(DriveServiceObserver* observer) OVERRIDE;
   virtual void RemoveObserver(DriveServiceObserver* observer) OVERRIDE;
-  virtual OperationRegistry* operation_registry() const OVERRIDE;
   virtual bool CanStartOperation() const OVERRIDE;
   virtual void CancelAll() OVERRIDE;
+  virtual bool CancelForFilePath(const FilePath& file_path) OVERRIDE;
+  virtual OperationProgressStatusList GetProgressStatusList() const OVERRIDE;
   virtual void Authenticate(const AuthStatusCallback& callback) OVERRIDE;
   virtual bool HasAccessToken() const OVERRIDE;
   virtual bool HasRefreshToken() const OVERRIDE;
@@ -97,9 +99,16 @@ class GDataWapiService : public DriveServiceInterface,
                             const GetDataCallback& callback) OVERRIDE;
 
  private:
+  OperationRegistry* operation_registry() const;
+
   // AuthService::Observer override.
   virtual void OnOAuth2RefreshTokenChanged() OVERRIDE;
 
+  // DriveServiceObserver Overrides
+  virtual void OnProgressUpdate(
+      const OperationProgressStatusList& list) OVERRIDE;
+  virtual void OnAuthenticationFailed() OVERRIDE;
+
   Profile* profile_;
   scoped_ptr<OperationRunner> runner_;
   ObserverList<DriveServiceObserver> observers_;