Merge 37154 - Fixed race condition with AddressWatchTask and ServerConnection...

chrome/browser/sync/engine/syncapi.cc

 // Copyright (c) 2006-2009 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/engine/syncapi.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 1068 matching lines @@
   FilePath settings_db_file =
       database_location.Append(FilePath(kBookmarkSyncUserSettingsDatabase));
   user_settings_.reset(new UserSettings());
   if (!user_settings_->Init(settings_db_file))
     return false;
 
   share_.dir_manager.reset(new DirectoryManager(database_location));
 
   string client_id = user_settings_->GetClientId();
   connection_manager_.reset(new SyncAPIServerConnectionManager(
-      sync_server_and_path, port, use_ssl, user_agent, client_id));
+      sync_server_and_path, port, use_ssl, user_agent, client_id,
+      post_factory));
 
   // TODO(timsteele): This is temporary windows crap needed to listen for
   // network status changes. We should either pump this up to the embedder to
   // do (and call us in CheckServerReachable, for ex), or at least make this
   // platform independent in here.
 #if defined(OS_WIN)
   HANDLE exit_flag = CreateEvent(NULL, TRUE /*manual reset*/, FALSE, NULL);
   address_watch_params_.exit_flag = exit_flag;
 #elif defined(OS_LINUX)
   if (pipe(address_watch_params_.exit_pipe) == -1) {
@@ skipping 10 matching lines @@
 
 #if defined(OS_MACOSX)
   {
     AutoLock auto_lock(address_watch_params_.run_loop_lock);
     while (!address_watch_params_.run_loop_initialized) {
       address_watch_params_.params_set.Wait();
     }
   }
 #endif
 
-  // Hand over the bridged POST factory to be owned by the connection
-  // dir_manager.
-  connection_manager()->SetHttpPostProviderFactory(post_factory);
-
   // Watch various objects for aggregated status.
   allstatus()->WatchConnectionManager(connection_manager());
 
   std::string gaia_url = browser_sync::kGaiaUrl;
   const char* service_id = gaia_service_id ?
       gaia_service_id : SYNC_SERVICE_NAME;
 
   talk_mediator_.reset(new TalkMediatorImpl());
   allstatus()->WatchTalkMediator(talk_mediator());
 
@@ skipping 561 matching lines @@
 BaseTransaction::~BaseTransaction() {
   delete lookup_;
 }
 
 UserShare* SyncManager::GetUserShare() const {
   DCHECK(data_->initialized()) << "GetUserShare requires initialization!";
   return data_->GetUserShare();
 }
 
 }  // namespace sync_api