[SyncFS] Migrate SyncWorker::Observer to SyncWorkerInterface

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

 // Copyright 2013 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/sync_file_system/drive_backend/sync_engine.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 #include "chrome/browser/sync_file_system/drive_backend/register_app_task.h"
 #include "chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h"
 #include "chrome/browser/sync_file_system/drive_backend/remote_change_processor_wrapper.h"
 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_worker.h"
+#include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h"
 #include "chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h"
 #include "chrome/browser/sync_file_system/file_status_observer.h"
 #include "chrome/browser/sync_file_system/logger.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 #include "google_apis/drive/drive_api_url_generator.h"
 #include "google_apis/drive/gdata_wapi_url_generator.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "webkit/common/blob/scoped_file.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
 namespace sync_file_system {
 
 class RemoteChangeProcessor;
 
 namespace drive_backend {
 
-class SyncEngine::WorkerObserver : public SyncWorker::Observer {
+class SyncEngine::WorkerObserver : public SyncWorkerInterface::Observer {
  public:
   WorkerObserver(base::SequencedTaskRunner* ui_task_runner,
                  base::WeakPtr<SyncEngine> sync_engine)
       : ui_task_runner_(ui_task_runner),
         sync_engine_(sync_engine) {
     sequence_checker_.DetachFromSequence();
   }
 
   virtual ~WorkerObserver() {
     DCHECK(sequence_checker_.CalledOnValidSequencedThread());
@@ skipping 156 matching lines @@
   Reset();
 }
 
 void SyncEngine::Reset() {
   if (notification_manager_)
     notification_manager_->RemoveObserver(this);
   if (drive_service_)
     drive_service_->RemoveObserver(this);
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 
+  DeleteSoon(FROM_HERE, worker_task_runner_, sync_worker_.Pass());
   DeleteSoon(FROM_HERE, worker_task_runner_, worker_observer_.Pass());
-  DeleteSoon(FROM_HERE, worker_task_runner_, sync_worker_.Pass());
   DeleteSoon(FROM_HERE, worker_task_runner_,
              remote_change_processor_on_worker_.Pass());
 
   drive_service_wrapper_.reset();
   drive_service_.reset();
   drive_uploader_wrapper_.reset();
   drive_uploader_.reset();
   remote_change_processor_wrapper_.reset();
   callback_tracker_.AbortAll();
 }
@@ skipping 57 matching lines @@
                             worker_task_runner_,
                             file_task_runner_));
 
   worker_observer_.reset(
       new WorkerObserver(ui_task_runner_, weak_ptr_factory_.GetWeakPtr()));
 
   base::WeakPtr<ExtensionServiceInterface> extension_service_weak_ptr;
   if (extension_service_)
     extension_service_weak_ptr = extension_service_->AsWeakPtr();
 
-  scoped_ptr<SyncWorker> worker(new SyncWorker(
+  sync_worker_.reset(new SyncWorker(
       sync_file_system_dir_,
       extension_service_weak_ptr,
       sync_engine_context.Pass(),
       env_override_));
-
-  worker->AddObserver(worker_observer_.get());
-  sync_worker_ = worker.PassAs<SyncWorkerInterface>();
+  sync_worker_->AddObserver(worker_observer_.get());
 
   if (remote_change_processor_)
     SetRemoteChangeProcessor(remote_change_processor_);
 
   worker_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&SyncWorkerInterface::Initialize,
                  base::Unretained(sync_worker_.get())));
 
   if (notification_manager_)
@@ skipping 281 matching lines @@
 
 SyncStatusCallback SyncEngine::TrackCallback(
     const SyncStatusCallback& callback) {
   return callback_tracker_.Register(
       base::Bind(callback, SYNC_STATUS_ABORT),
       callback);
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system