[SyncFS] Migrate SyncWorker::Observer to SyncWorkerInterface

chrome/browser/sync_file_system/drive_backend/sync_worker.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h"
 #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
-#include "chrome/browser/sync_file_system/sync_action.h"
 #include "chrome/browser/sync_file_system/sync_callbacks.h"
-#include "chrome/browser/sync_file_system/sync_direction.h"
 #include "chrome/browser/sync_file_system/task_logger.h"
 #include "net/base/network_change_notifier.h"
 
 class ExtensionServiceInterface;
 class GURL;
 
 namespace base {
 class ListValue;
 }
 
@@ skipping 20 matching lines @@
 class LocalToRemoteSyncer;
 class MetadataDatabase;
 class RemoteChangeProcessorOnWorker;
 class RemoteToLocalSyncer;
 class SyncEngineContext;
 class SyncEngineInitializer;
 
 class SyncWorker : public SyncWorkerInterface,
                    public SyncTaskManager::Client {
  public:
-  enum AppStatus {
-    APP_STATUS_ENABLED,
-    APP_STATUS_DISABLED,
-    APP_STATUS_UNINSTALLED,
-  };
-
-  typedef base::hash_map<std::string, AppStatus> AppStatusMap;
-
-  class Observer {
-   public:
-    virtual void OnPendingFileListUpdated(int item_count) = 0;
-    virtual void OnFileStatusChanged(const fileapi::FileSystemURL& url,
-                                     SyncFileStatus file_status,
-                                     SyncAction sync_action,
-                                     SyncDirection direction) = 0;
-    virtual void UpdateServiceState(RemoteServiceState state,
-                                    const std::string& description) = 0;
-
-   protected:
-    virtual ~Observer() {}
-  };
-
   SyncWorker(const base::FilePath& base_dir,
              const base::WeakPtr<ExtensionServiceInterface>& extension_service,
              scoped_ptr<SyncEngineContext> sync_engine_context,
              leveldb::Env* env_override);
 
   virtual ~SyncWorker();
 
   virtual void Initialize() OVERRIDE;
 
   // SyncTaskManager::Client overrides
@@ skipping 39 matching lines @@
   virtual void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
   virtual drive::DriveServiceInterface* GetDriveService() OVERRIDE;
   virtual drive::DriveUploaderInterface* GetDriveUploader() OVERRIDE;
   virtual MetadataDatabase* GetMetadataDatabase() OVERRIDE;
   virtual SyncTaskManager* GetSyncTaskManager() OVERRIDE;
 
   virtual void DetachFromSequence() OVERRIDE;
 
-  void AddObserver(Observer* observer);
+  virtual void AddObserver(Observer* observer) OVERRIDE;
 
  private:
   friend class DriveBackendSyncTest;
   friend class SyncWorkerTest;
 
+  enum AppStatus {
+    APP_STATUS_ENABLED,
+    APP_STATUS_DISABLED,
+    APP_STATUS_UNINSTALLED,
+  };
+
+  typedef base::hash_map<std::string, AppStatus> AppStatusMap;
+
   // SyncWorkerInterface overrides.
   // TODO(peria): Remove this interface after making FakeSyncWorker class.
   virtual void SetHasRefreshToken(bool has_refresh_token) OVERRIDE;
 
   void DoDisableApp(const std::string& app_id,
                     const SyncStatusCallback& callback);
   void DoEnableApp(const std::string& app_id,
                    const SyncStatusCallback& callback);
 
   void PostInitializeTask();
   void DidInitialize(SyncEngineInitializer* initializer,
                      SyncStatusCode status);
   void UpdateRegisteredApps();
+  static void QueryAppStatusOnUIThread(
+      const base::WeakPtr<ExtensionServiceInterface>& extension_service_ptr,
+      const std::vector<std::string>* app_ids,
+      AppStatusMap* status,
+      const base::Closure& callback);
   void DidQueryAppStatus(const AppStatusMap* app_status);
   void DidProcessRemoteChange(RemoteToLocalSyncer* syncer,
                               const SyncFileCallback& callback,
                               SyncStatusCode status);
   void DidApplyLocalChange(LocalToRemoteSyncer* syncer,
                            const SyncStatusCallback& callback,
                            SyncStatusCode status);
 
   void MaybeStartFetchChanges();
   void DidResolveConflict(SyncStatusCode status);
@@ skipping 32 matching lines @@
   base::SequenceChecker sequence_checker_;
 
   base::WeakPtrFactory<SyncWorker> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(SyncWorker);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_