[Sync] Make SyncBackendHost::Core use a WeakHandle to its host

chrome/browser/sync/test_profile_sync_service.cc

 // Copyright (c) 2011 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/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/internal_api/user_share.h"
@@ skipping 48 matching lines @@
 
 SyncBackendHostForProfileSyncTest::~SyncBackendHostForProfileSyncTest() {}
 
 void SyncBackendHostForProfileSyncTest::
     SimulateSyncCycleCompletedInitialSyncEnded(
     const tracked_objects::Location& location) {
   syncable::ModelTypeSet sync_ended;
   if (!fail_initial_download_)
     sync_ended = syncable::ModelTypeSet::All();
   std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
-  core_->HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot(
+  HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot(
       SyncerStatus(), ErrorCounters(), 0, false,
       sync_ended, download_progress_markers, false, false, 0, 0, 0, false,
       SyncSourceInfo(), 0, base::Time::Now()));
 }
 
-sync_api::HttpPostProviderFactory*
-    SyncBackendHostForProfileSyncTest::MakeHttpBridgeFactory(
-        const scoped_refptr<net::URLRequestContextGetter>& getter) {
-  return new browser_sync::TestHttpBridgeFactory;
+namespace {
+
+sync_api::HttpPostProviderFactory* MakeTestHttpBridgeFactory() {
+  return new browser_sync::TestHttpBridgeFactory();
 }
 
+}  // namespace
+
 void SyncBackendHostForProfileSyncTest::InitCore(
-    const Core::DoInitializeOptions& options) {
-  Core::DoInitializeOptions test_options = options;
+    const DoInitializeOptions& options) {
+  DoInitializeOptions test_options = options;
+  test_options.make_http_bridge_factory_fn =
+      base::Bind(&MakeTestHttpBridgeFactory);
   test_options.credentials.email = "testuser@gmail.com";
   test_options.credentials.sync_token = "token";
   test_options.restored_key_for_bootstrapping = "";
   test_options.setup_for_test_mode = true;
   SyncBackendHost::InitCore(test_options);
   // TODO(akalin): Figure out a better way to do this.
   if (synchronous_init_) {
     // The SyncBackend posts a task to the current loop when
     // initialization completes.
     MessageLoop::current()->Run();
   }
 }
 
 void SyncBackendHostForProfileSyncTest::StartConfiguration(
     const base::Closure& callback) {
   SyncBackendHost::FinishConfigureDataTypesOnFrontendLoop();
-  if (initialization_state_ == DOWNLOADING_NIGORI) {
+  if (IsDownloadingNigoriForTest()) {
     syncable::ModelTypeSet sync_ended;
 
     if (!fail_initial_download_)
       sync_ended.Put(syncable::NIGORI);
     std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
-    core_->HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot(
+    HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot(
         SyncerStatus(), ErrorCounters(), 0, false,
         sync_ended, download_progress_markers, false, false, 0, 0, 0, false,
         SyncSourceInfo(), 0, base::Time::Now()));
   }
 }
 
 void SyncBackendHostForProfileSyncTest::
     SetDefaultExpectationsForWorkerCreation(ProfileMock* profile) {
   EXPECT_CALL(*profile, GetPasswordStore(testing::_)).
       WillOnce(testing::Return((PasswordStore*)NULL));
@@ skipping 121 matching lines @@
 }
 
 void TestProfileSyncService::CreateBackend() {
   backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest(
       profile(),
       sync_prefs_.AsWeakPtr(),
       set_initial_sync_ended_on_init_,
       synchronous_backend_initialization_,
       fail_initial_download_));
 }