[Sync] Pass a TaskRunner into SBHI/SBHC, not a thread or message loop.

components/sync/driver/glue/sync_backend_host_core.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
 #define COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
+#include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "components/invalidation/public/invalidation.h"
 #include "components/sync/base/cancelation_signal.h"
 #include "components/sync/base/system_encryptor.h"
 #include "components/sync/driver/glue/sync_backend_host_impl.h"
 #include "components/sync/engine/cycle/type_debug_info_observer.h"
 #include "components/sync/engine/shutdown_reason.h"
 #include "components/sync/engine/sync_encryption_handler.h"
 #include "url/gurl.h"
 
 namespace syncer {
 
 class SyncBackendHostImpl;
 
 // Utility struct for holding initialization options.
 struct DoInitializeOptions {
   DoInitializeOptions(
-      base::MessageLoop* sync_loop,
+      scoped_refptr<base::SingleThreadTaskRunner> sync_task_runner,
       SyncBackendRegistrar* registrar,
       const std::vector<scoped_refptr<ModelSafeWorker>>& workers,
       const scoped_refptr<ExtensionsActivity>& extensions_activity,
       const WeakHandle<JsEventHandler>& event_handler,
       const GURL& service_url,
       const std::string& sync_user_agent,
       std::unique_ptr<HttpPostProviderFactory> http_bridge_factory,
       const SyncCredentials& credentials,
       const std::string& invalidator_client_id,
       std::unique_ptr<SyncManagerFactory> sync_manager_factory,
       bool delete_sync_data_folder,
       bool enable_local_sync_backend,
       const base::FilePath& local_sync_backend_folder,
       const std::string& restored_key_for_bootstrapping,
       const std::string& restored_keystore_key_for_bootstrapping,
       std::unique_ptr<EngineComponentsFactory> engine_components_factory,
       const WeakHandle<UnrecoverableErrorHandler>& unrecoverable_error_handler,
       const base::Closure& report_unrecoverable_error_function,
       std::unique_ptr<SyncEncryptionHandler::NigoriState> saved_nigori_state,
       const std::map<ModelType, int64_t>& invalidation_versions);
   ~DoInitializeOptions();
 
-  base::MessageLoop* sync_loop;
+  scoped_refptr<base::SingleThreadTaskRunner> sync_task_runner;
   SyncBackendRegistrar* registrar;
   std::vector<scoped_refptr<ModelSafeWorker>> workers;
   scoped_refptr<ExtensionsActivity> extensions_activity;
   WeakHandle<JsEventHandler> event_handler;
   GURL service_url;
   std::string sync_user_agent;
   // Overridden by tests.
   std::unique_ptr<HttpPostProviderFactory> http_bridge_factory;
   SyncCredentials credentials;
   const std::string invalidator_client_id;
@@ skipping 25 matching lines @@
 
 class SyncBackendHostCore
     : public base::RefCountedThreadSafe<SyncBackendHostCore>,
       public base::trace_event::MemoryDumpProvider,
       public SyncEncryptionHandler::Observer,
       public SyncManager::Observer,
       public TypeDebugInfoObserver {
  public:
   SyncBackendHostCore(const std::string& name,
                       const base::FilePath& sync_data_folder_path,
-                      bool has_sync_setup_completed,
                       const base::WeakPtr<SyncBackendHostImpl>& backend);
 
   // MemoryDumpProvider implementation.
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
   // SyncManager::Observer implementation.  The Core just acts like an air
   // traffic controller here, forwarding incoming messages to appropriate
   // landing threads.
   void OnSyncCycleCompleted(const SyncCycleSnapshot& snapshot) override;
@@ skipping 155 matching lines @@
 
   // Name used for debugging.
   const std::string name_;
 
   // Path of the folder that stores the sync data files.
   const base::FilePath sync_data_folder_path_;
 
   // Our parent SyncBackendHost.
   WeakHandle<SyncBackendHostImpl> host_;
 
-  // The loop where all the sync backend operations happen.
-  // Non-null only between calls to DoInitialize() and ~Core().
-  base::MessageLoop* sync_loop_;
-
   // Our parent's registrar (not owned).  Non-null only between
   // calls to DoInitialize() and DoShutdown().
-  SyncBackendRegistrar* registrar_;
+  SyncBackendRegistrar* registrar_ = nullptr;
 
   // The timer used to periodically call SaveChanges.
   std::unique_ptr<base::RepeatingTimer> save_changes_timer_;
 
   // Our encryptor, which uses Chrome's encryption functions.
   SystemEncryptor encryptor_;
 
   // The top-level syncapi entry point.  Lives on the sync thread.
   std::unique_ptr<SyncManager> sync_manager_;
 
   // Temporary holder of sync manager's initialization results. Set by
   // OnInitializeComplete, and consumed when we pass it via OnBackendInitialized
   // in the final state of HandleInitializationSuccessOnFrontendLoop.
   WeakHandle<JsBackend> js_backend_;
   WeakHandle<DataTypeDebugInfoListener> debug_info_listener_;
 
   // These signals allow us to send requests to shut down the HttpBridgeFactory
   // and ServerConnectionManager without having to wait for those classes to
   // finish initializing first.
   //
   // See comments in SyncBackendHostCore::ShutdownOnUIThread() for more details.
   CancelationSignal release_request_context_signal_;
   CancelationSignal stop_syncing_signal_;
 
-  // Matches the value of SyncPref's IsFirstSetupComplete() flag at init time.
-  // Should not be used for anything except for UMAs and logging.
-  const bool has_sync_setup_completed_;
-
   // Set when we've been asked to forward sync protocol events to the frontend.
-  bool forward_protocol_events_;
+  bool forward_protocol_events_ = false;
 
   // Set when the forwarding of per-type debug counters is enabled.
-  bool forward_type_info_;
+  bool forward_type_info_ = false;
 
   // A map of data type -> invalidation version to track the most recently
   // received invalidation version for each type.
   // This allows dropping any invalidations with versions older than those
   // most recently received for that data type.
   std::map<ModelType, int64_t> last_invalidation_versions_;
 
+  // Checks that we are on the sync thread.
+  base::ThreadChecker thread_checker_;
+
   base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_