Retry: sync: Gracefully handle early shutdown

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/data_type_controller.h"
@@ skipping 46 matching lines @@
 
 scoped_ptr<syncer::HttpPostProviderFactory> MakeTestHttpBridgeFactory() {
   return scoped_ptr<syncer::HttpPostProviderFactory>(
       new browser_sync::TestHttpBridgeFactory());
 }
 
 }  // namespace
 
 void SyncBackendHostForProfileSyncTest::InitCore(
     scoped_ptr<DoInitializeOptions> options) {
-  options->make_http_bridge_factory_fn =
-      base::Bind(&MakeTestHttpBridgeFactory);
+  options->http_bridge_factory = MakeTestHttpBridgeFactory();
   options->credentials.email = "testuser@gmail.com";
   options->credentials.sync_token = "token";
   options->restored_key_for_bootstrapping = "";
   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();
@@ skipping 249 matching lines @@
 }
 
 BrowserContextKeyedService* FakeOAuth2TokenService::BuildTokenService(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
 
   FakeOAuth2TokenService* service = new FakeOAuth2TokenService();
   service->Initialize(profile);
   return service;
 }