Refactor SyncBackendHost

chrome/browser/sync/test_profile_sync_service.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 "chrome/browser/sync/test_profile_sync_service.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
+#include "chrome/browser/sync/glue/sync_backend_host_core.h"

[Nicolas Zea, 2013/11/06 18:03:21]

is this necessary?

[rlarocque, 2013/11/06 21:48:47]

Yeah, for DoInitializeOptions.  This may be an argument for pulling that
definition into its own file.

 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/test/test_http_bridge_factory.h"
 #include "sync/internal_api/public/test/sync_manager_factory_for_profile_sync_test.h"
 #include "sync/internal_api/public/user_share.h"
 #include "sync/js/js_reply_handler.h"
 #include "sync/protocol/encryption.pb.h"
 
 using syncer::InternalComponentsFactory;
 using syncer::ModelSafeRoutingInfo;
 using syncer::TestInternalComponentsFactory;
 using syncer::UserShare;
 
 namespace browser_sync {
 
 SyncBackendHostForProfileSyncTest::SyncBackendHostForProfileSyncTest(
     Profile* profile,
     const base::WeakPtr<SyncPrefs>& sync_prefs,
     base::Closure& callback,
     bool set_initial_sync_ended_on_init,
     bool synchronous_init,
     bool fail_initial_download,
     syncer::StorageOption storage_option)
-    : browser_sync::SyncBackendHost(
+    : browser_sync::SyncBackendHostImpl(
         profile->GetDebugName(), profile, sync_prefs),
       callback_(callback),
       fail_initial_download_(fail_initial_download),
       set_initial_sync_ended_on_init_(set_initial_sync_ended_on_init),
       synchronous_init_(synchronous_init),
       storage_option_(storage_option),
       weak_ptr_factory_(this) {}
 
 SyncBackendHostForProfileSyncTest::~SyncBackendHostForProfileSyncTest() {}
 
@@ skipping 19 matching lines @@
   syncer::StorageOption storage = storage_option_;
 
   // It'd be nice if we avoided creating the InternalComponentsFactory in the
   // first place, but SyncBackendHost will have created one by now so we must
   // free it. Grab the switches to pass on first.
   InternalComponentsFactory::Switches factory_switches =
       options->internal_components_factory->GetSwitches();
   options->internal_components_factory.reset(
       new TestInternalComponentsFactory(factory_switches, storage));
 
-  SyncBackendHost::InitCore(options.Pass());
+  SyncBackendHostImpl::InitCore(options.Pass());
   if (synchronous_init_ && !base::MessageLoop::current()->is_running()) {
     // The SyncBackend posts a task to the current loop when
     // initialization completes.
     base::MessageLoop::current()->Run();
   }
 }
 
 void SyncBackendHostForProfileSyncTest::UpdateCredentials(
       const syncer::SyncCredentials& credentials) {
   // If we had failed the initial download, complete initialization now.
@@ skipping 39 matching lines @@
     initial_download_closure_ = base::Bind(
         &SyncBackendHostForProfileSyncTest::
             HandleInitializationSuccessOnFrontendLoop,
         weak_ptr_factory_.GetWeakPtr(),
         js_backend,
         debug_info_listener);
     HandleControlTypesDownloadRetry();
     if (synchronous_init_)
       base::MessageLoop::current()->Quit();
   } else {
-    SyncBackendHost::HandleInitializationSuccessOnFrontendLoop(
+    SyncBackendHostImpl::HandleInitializationSuccessOnFrontendLoop(
         js_backend,
         debug_info_listener);
   }
 }
 
 }  // namespace browser_sync
 
 syncer::TestIdFactory* TestProfileSyncService::id_factory() {
   return &id_factory_;
 }
@@ skipping 153 matching lines @@
 void FakeOAuth2TokenService::PersistCredentials(
     const std::string& account_id,
     const std::string& refresh_token) {
   // Disabling the token persistence.
 }
 
 void FakeOAuth2TokenService::ClearPersistedCredentials(
     const std::string& account_id) {
   // Disabling the token persistence.
 }