5 files changed, 1 insertions, 32 deletions
diff --git a/chrome/browser/chromeos/gdata/gdata.cc b/chrome/browser/chromeos/gdata/gdata.cc
index 7bffcb7..9b7d666 100644
--- a/chrome/browser/chromeos/gdata/gdata.cc
+++ b/chrome/browser/chromeos/gdata/gdata.cc
@@ -196,10 +196,6 @@ void DocumentsService::Initialize(Profile* profile) {
   gdata_auth_service_->Initialize(profile);
 }
 
-GDataOperationRegistry* DocumentsService::operation_registry() const {
-  return operation_registry_.get();
-}
-
 void DocumentsService::CancelAll() {
   operation_registry_->CancelAll();
 }
diff --git a/chrome/browser/chromeos/gdata/gdata.h b/chrome/browser/chromeos/gdata/gdata.h
index 81295cd..1bf4219 100644
--- a/chrome/browser/chromeos/gdata/gdata.h
+++ b/chrome/browser/chromeos/gdata/gdata.h
@@ -144,9 +144,6 @@ class DocumentsServiceInterface {
   // Initializes the documents service tied with |profile|.
   virtual void Initialize(Profile* profile) = 0;
 
-  // Retrieves the operation registry.
-  virtual GDataOperationRegistry* operation_registry() const = 0;
-
   // Cancels all in-flight operations.
   virtual void CancelAll() = 0;
 
@@ -272,7 +269,6 @@ class DocumentsService
 
   // DocumentsServiceInterface Overrides
   virtual void Initialize(Profile* profile) OVERRIDE;
-  virtual GDataOperationRegistry* operation_registry() const OVERRIDE;
   virtual void CancelAll() OVERRIDE;
   virtual void Authenticate(const AuthStatusCallback& callback) OVERRIDE;
   virtual void GetDocuments(const GURL& feed_url,
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.cc b/chrome/browser/chromeos/gdata/gdata_file_system.cc
index d2e9f4f..6abc551 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/gdata/gdata.h"
 #include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
+#include "chrome/browser/chromeos/gdata/gdata_parser.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -1264,22 +1265,6 @@ void GDataFileSystem::OnGetAvailableSpace(
                feed->quota_bytes_used());
 }
 
-std::vector<GDataOperationRegistry::ProgressStatus>
-    GDataFileSystem::GetProgressStatusList() {
-  return documents_service_->operation_registry()->GetProgressStatusList();
-}
-
-void GDataFileSystem::AddOperationObserver(
-    GDataOperationRegistry::Observer* observer) {
-  return documents_service_->operation_registry()->AddObserver(observer);
-}
-
-void GDataFileSystem::RemoveOperationObserver(
-    GDataOperationRegistry::Observer* observer) {
-  return documents_service_->operation_registry()->RemoveObserver(observer);
-}
-
-
 void GDataFileSystem::OnCreateDirectoryCompleted(
     const CreateDirectoryParams& params,
     GDataErrorCode status,
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.h b/chrome/browser/chromeos/gdata/gdata_file_system.h
index cb9dbb1..e9fe0dd 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system.h
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.h
@@ -19,7 +19,6 @@
 #include "base/platform_file.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
-#include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_params.h"
 #include "chrome/browser/chromeos/gdata/gdata_parser.h"
 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
@@ -243,12 +242,6 @@ class GDataFileSystem : public ProfileKeyedService {
   void GetCacheState(const std::string& resource_id,
                      const std::string& md5,
                      const GetCacheStateCallback& callback);
-  // Obtains the list of currently active operations.
-  std::vector<GDataOperationRegistry::ProgressStatus> GetProgressStatusList();
-  // Add operation observer.
-  void AddOperationObserver(GDataOperationRegistry::Observer* observer);
-  // Remove operation observer.
-  void RemoveOperationObserver(GDataOperationRegistry::Observer* observer);
 
   // Finds file object by |file_path| and returns its |file_info|.
   // Returns true if file was found.
diff --git a/chrome/browser/chromeos/gdata/gdata_mock.h b/chrome/browser/chromeos/gdata/gdata_mock.h
index bd848e0..d967c01 100644
--- a/chrome/browser/chromeos/gdata/gdata_mock.h
+++ b/chrome/browser/chromeos/gdata/gdata_mock.h
@@ -28,7 +28,6 @@ class MockDocumentsService : public DocumentsServiceInterface {
 
   // DocumentServiceInterface overrides.
   MOCK_METHOD1(Initialize, void(Profile* profile));
-  MOCK_CONST_METHOD0(operation_registry, GDataOperationRegistry*());
   MOCK_METHOD0(CancelAll, void(void));
   MOCK_METHOD1(Authenticate, void(const AuthStatusCallback& callback));
   MOCK_METHOD2(GetDocuments, void(const GURL& feed_url,