[Sync] Move thread checking into the ModelSafeWorker interface.

components/browser_sync/profile_sync_service_unittest.cc

 // Copyright (c) 2012 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 "components/browser_sync/profile_sync_service.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 86 matching lines @@
   bool setup_in_progress_;
 };
 
 // A variant of the SyncBackendHostMock that won't automatically
 // call back when asked to initialized.  Allows us to test things
 // that could happen while backend init is in progress.
 class SyncBackendHostNoReturn : public SyncBackendHostMock {
   void Initialize(
       syncer::SyncFrontend* frontend,
       base::Thread* sync_thread,
-      const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
-      const scoped_refptr<base::SingleThreadTaskRunner>& file_thread,
       const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
       const GURL& service_url,
       const std::string& sync_user_agent,
       const syncer::SyncCredentials& credentials,
       bool delete_sync_data_folder,
       bool enable_local_sync_backend,
       const base::FilePath& local_sync_backend_folder,
       std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory,
       const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
           unrecoverable_error_handler,
       const base::Closure& report_unrecoverable_error_function,
       const HttpPostProviderFactoryGetter& http_post_provider_factory_getter,
       std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>
           saved_nigori_state) override {}
 };
 
 class SyncBackendHostMockCollectDeleteDirParam : public SyncBackendHostMock {
  public:
   explicit SyncBackendHostMockCollectDeleteDirParam(
       std::vector<bool>* delete_dir_param)
       : delete_dir_param_(delete_dir_param) {}
 
   void Initialize(
       syncer::SyncFrontend* frontend,
       base::Thread* sync_thread,
-      const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
-      const scoped_refptr<base::SingleThreadTaskRunner>& file_thread,
       const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
       const GURL& service_url,
       const std::string& sync_user_agent,
       const syncer::SyncCredentials& credentials,
       bool delete_sync_data_folder,
       bool enable_local_sync_backend,
       const base::FilePath& local_sync_backend_folder,
       std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory,
       const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
           unrecoverable_error_handler,
       const base::Closure& report_unrecoverable_error_function,
       const HttpPostProviderFactoryGetter& http_post_provider_factory_getter,
       std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>
           saved_nigori_state) override {
     delete_dir_param_->push_back(delete_sync_data_folder);
     SyncBackendHostMock::Initialize(
-        frontend, sync_thread, db_thread, file_thread, event_handler,
-        service_url, sync_user_agent, credentials, delete_sync_data_folder,
-        enable_local_sync_backend, local_sync_backend_folder,
-        std::move(sync_manager_factory), unrecoverable_error_handler,
-        report_unrecoverable_error_function, http_post_provider_factory_getter,
-        std::move(saved_nigori_state));
+        frontend, sync_thread, event_handler, service_url, sync_user_agent,
+        credentials, delete_sync_data_folder, enable_local_sync_backend,
+        local_sync_backend_folder, std::move(sync_manager_factory),
+        unrecoverable_error_handler, report_unrecoverable_error_function,
+        http_post_provider_factory_getter, std::move(saved_nigori_state));
   }
 
  private:
   std::vector<bool>* delete_dir_param_;
 };
 
 // SyncBackendHostMock that calls an external callback when ClearServerData is
 // called.
 class SyncBackendHostCaptureClearServerData : public SyncBackendHostMock {
  public:
@@ skipping 784 matching lines @@
 // dereferenced in OnSyncCycleCompleted. The fix is to use find() to check if
 // entry for sessions exists in map.
 TEST_F(ProfileSyncServiceTest, ValidPointersInDTCMap) {
   CreateService(ProfileSyncService::AUTO_START);
   service()->OnSessionRestoreComplete();
   service()->OnSyncCycleCompleted();
 }
 
 }  // namespace
 }  // namespace browser_sync