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

chrome/browser/chromeos/gdata/drive_api_service.h

Index: chrome/browser/chromeos/gdata/drive_api_service.h
diff --git a/chrome/browser/chromeos/gdata/drive_api_service.h b/chrome/browser/chromeos/gdata/drive_api_service.h
index 0f8420b58f3c7da363727d7bfe3fd4bd52bce8e6..ecc7bd82c8e20c5914c5964201c715cd7645c35b 100644
--- a/chrome/browser/chromeos/gdata/drive_api_service.h
+++ b/chrome/browser/chromeos/gdata/drive_api_service.h
@@ -25,7 +25,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 DriveAPIService : public DriveServiceInterface,
-                        public AuthService::Observer {
+                        public AuthService::Observer,
+                        public OperationRegistry::Observer {
  public:
   // Instance is usually created by DriveSystemServiceFactory and owned by
   // DriveFileSystem.
@@ -36,9 +37,10 @@ class DriveAPIService : 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;
@@ -93,6 +95,8 @@ class DriveAPIService : public DriveServiceInterface,
                             const GetDataCallback& callback) OVERRIDE;
 
  private:
+  OperationRegistry* operation_registry() const;
+
   // Fetches a changelist from |url| with |start_changestamp|, using Drive V2
   // API. If this URL is empty the call will use the default URL. Specify |url|
   // when pagenated request should be issued.
@@ -115,6 +119,11 @@ class DriveAPIService : public DriveServiceInterface,
   // 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_;