Remove unused SyncClient param from SyncEngineImpl

Bug: none
Change-Id: I0d9651396226a6fb7f82a73b23c5e4a151eff26f
Reviewed-on: https://chromium-review.googlesource.com/c/1436236
Auto-Submit: Marc Treib <treib@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626486}

components/browser_sync/abstract_profile_sync_service_test.cc

@@ -41,7 +41,6 @@ class SyncEngineForProfileSyncTest : public SyncEngineImpl {
  public:
   SyncEngineForProfileSyncTest(
       const base::FilePath& temp_dir,
-      syncer::SyncClient* sync_client,
       invalidation::InvalidationService* invalidator,
       const base::WeakPtr<syncer::SyncPrefs>& sync_prefs,
       base::OnceClosure callback);
@@ -62,13 +61,11 @@ class SyncEngineForProfileSyncTest : public SyncEngineImpl {
 
 SyncEngineForProfileSyncTest::SyncEngineForProfileSyncTest(
     const base::FilePath& temp_dir,
-    syncer::SyncClient* sync_client,
     invalidation::InvalidationService* invalidator,
     const base::WeakPtr<syncer::SyncPrefs>& sync_prefs,
     base::OnceClosure callback)
     : SyncEngineImpl(
           "dummy_debug_name",
-          sync_client,
           invalidator,
           sync_prefs,
           temp_dir.Append(base::FilePath(FILE_PATH_LITERAL("test")))),
@@ -142,7 +139,7 @@ void AbstractProfileSyncServiceTest::CreateSyncService(
   syncer::SyncApiComponentFactoryMock* components =
       profile_sync_service_bundle_.component_factory();
   auto engine = std::make_unique<SyncEngineForProfileSyncTest>(
-      temp_dir_.GetPath(), sync_service_->GetSyncClientForTest(),
+      temp_dir_.GetPath(),
       profile_sync_service_bundle_.fake_invalidation_service(),
       sync_service_->sync_prefs()->AsWeakPtr(),
       std::move(initialization_success_callback));

components/browser_sync/profile_sync_components_factory_impl.cc

@@ -442,8 +442,8 @@ ProfileSyncComponentsFactoryImpl::CreateSyncEngine(
     invalidation::InvalidationService* invalidator,
     const base::WeakPtr<syncer::SyncPrefs>& sync_prefs,
     const base::FilePath& sync_data_folder) {
-  return std::make_unique<syncer::SyncEngineImpl>(
-      name, sync_client_, invalidator, sync_prefs, sync_data_folder);
+  return std::make_unique<syncer::SyncEngineImpl>(name, invalidator, sync_prefs,
+                                                  sync_data_folder);
 }
 
 syncer::SyncApiComponentFactory::SyncComponents

components/sync/driver/glue/sync_engine_impl.cc

@@ -20,7 +20,6 @@
 #include "components/sync/base/invalidation_helper.h"
 #include "components/sync/base/sync_prefs.h"
 #include "components/sync/driver/glue/sync_backend_host_core.h"
-#include "components/sync/driver/sync_client.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/sync/engine/data_type_activation_response.h"
 #include "components/sync/engine/engine_components_factory.h"
@@ -33,22 +32,13 @@
 #include "components/sync/engine/sync_string_conversions.h"
 #include "components/sync/syncable/base_transaction.h"
 
-// Helper macros to log with the syncer thread name; useful when there
-// are multiple syncers involved.
-
-#define SLOG(severity) LOG(severity) << name_ << ": "
-
-#define SDVLOG(verbose_level) DVLOG(verbose_level) << name_ << ": "
-
 namespace syncer {
 
 SyncEngineImpl::SyncEngineImpl(const std::string& name,
-                               SyncClient* sync_client,
                                invalidation::InvalidationService* invalidator,
                                const base::WeakPtr<SyncPrefs>& sync_prefs,
                                const base::FilePath& sync_data_folder)
-    : sync_client_(sync_client),
-      name_(name),
+    : name_(name),
       sync_prefs_(sync_prefs),
       invalidator_(invalidator),
       weak_ptr_factory_(this) {
@@ -101,7 +91,7 @@ void SyncEngineImpl::StartConfiguration() {
 }
 
 void SyncEngineImpl::StartSyncingWithServer() {
-  SDVLOG(1) << "SyncEngineImpl::StartSyncingWithServer called.";
+  DVLOG(1) << name_ << ": SyncEngineImpl::StartSyncingWithServer called.";
   base::Time last_poll_time = sync_prefs_->GetLastPollTime();
   // If there's no known last poll time (e.g. on initial start-up), we treat
   // this as if a poll just happened.
@@ -496,7 +486,3 @@ void SyncEngineImpl::OnCookieJarChangedDoneOnFrontendLoop(
 }
 
 }  // namespace syncer
-
-#undef SDVLOG
-
-#undef SLOG

components/sync/driver/glue/sync_engine_impl.h

@@ -40,7 +40,6 @@ namespace syncer {
 class ChangeProcessor;
 class SyncBackendHostCore;
 class SyncBackendRegistrar;
-class SyncClient;
 class SyncPrefs;
 
 // The only real implementation of the SyncEngine. See that interface's
@@ -50,7 +49,6 @@ class SyncEngineImpl : public SyncEngine, public InvalidationHandler {
   using Status = SyncStatus;
 
   SyncEngineImpl(const std::string& name,
-                 SyncClient* sync_client,
                  invalidation::InvalidationService* invalidator,
                  const base::WeakPtr<SyncPrefs>& sync_prefs,
                  const base::FilePath& sync_data_folder);
@@ -196,8 +194,6 @@ class SyncEngineImpl : public SyncEngine, public InvalidationHandler {
 
   void OnCookieJarChangedDoneOnFrontendLoop(const base::Closure& callback);
 
-  SyncClient* const sync_client_;
-
   // The task runner where all the sync engine operations happen.
   scoped_refptr<base::SequencedTaskRunner> sync_task_runner_;
 

components/sync/driver/glue/sync_engine_impl_unittest.cc

@@ -33,7 +33,6 @@
 #include "components/sync/base/sync_prefs.h"
 #include "components/sync/base/test_unrecoverable_error_handler.h"
 #include "components/sync/device_info/device_info.h"
-#include "components/sync/driver/fake_sync_client.h"
 #include "components/sync/engine/cycle/commit_counters.h"
 #include "components/sync/engine/cycle/status_counters.h"
 #include "components/sync/engine/cycle/update_counters.h"
@@ -65,6 +64,15 @@ namespace {
 static const base::FilePath::CharType kTestSyncDir[] =
     FILE_PATH_LITERAL("sync-test");
 
+scoped_refptr<ModelSafeWorker> CreateModelWorkerForGroup(ModelSafeGroup group) {
+  switch (group) {
+    case GROUP_PASSIVE:
+      return new PassiveModelWorker();
+    default:
+      return nullptr;
+  }
+}
+
 class TestSyncEngineHost : public SyncEngineHostStub {
  public:
   explicit TestSyncEngineHost(
@@ -137,19 +145,6 @@ class FakeSyncManagerFactory : public SyncManagerFactory {
   FakeSyncManager** fake_manager_;
 };
 
-class BackendSyncClient : public FakeSyncClient {
- public:
-  scoped_refptr<ModelSafeWorker> CreateModelWorkerForGroup(
-      ModelSafeGroup group) override {
-    switch (group) {
-      case GROUP_PASSIVE:
-        return new PassiveModelWorker();
-      default:
-        return nullptr;
-    }
-  }
-};
-
 class NullEncryptionObserver : public SyncEncryptionHandler::Observer {
  public:
   void OnPassphraseRequired(
@@ -211,8 +206,7 @@ class SyncEngineImplTest : public testing::Test {
             UpdateRegisteredInvalidationIds(testing::_, testing::_))
         .WillByDefault(testing::Return(true));
     backend_ = std::make_unique<SyncEngineImpl>(
-        "dummyDebugName", &sync_client_, &invalidator_,
-        sync_prefs_->AsWeakPtr(),
+        "dummyDebugName", &invalidator_, sync_prefs_->AsWeakPtr(),
         temp_dir_.GetPath().Append(base::FilePath(kTestSyncDir)));
     credentials_.account_id = "user@example.com";
     credentials_.email = "user@example.com";
@@ -259,8 +253,7 @@ class SyncEngineImplTest : public testing::Test {
     params.sync_task_runner = sync_thread_.task_runner();
     params.host = &host_;
     params.registrar = std::make_unique<SyncBackendRegistrar>(
-        std::string(), base::Bind(&SyncClient::CreateModelWorkerForGroup,
-                                  base::Unretained(&sync_client_)));
+        std::string(), base::Bind(&CreateModelWorkerForGroup));
     params.encryption_observer_proxies.push_back(
         std::make_unique<NullEncryptionObserver>());
     params.http_factory_getter = std::move(http_post_provider_factory_getter);
@@ -336,7 +329,6 @@ class SyncEngineImplTest : public testing::Test {
   base::Thread sync_thread_;
   TestSyncEngineHost host_;
   SyncCredentials credentials_;
-  BackendSyncClient sync_client_;
   TestUnrecoverableErrorHandler test_unrecoverable_error_handler_;
   std::unique_ptr<SyncPrefs> sync_prefs_;
   std::unique_ptr<SyncEngineImpl> backend_;