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

chrome/browser/sync/engine/syncapi.cc

Index: chrome/browser/sync/engine/syncapi.cc
===================================================================
--- chrome/browser/sync/engine/syncapi.cc	(revision 37263)
+++ chrome/browser/sync/engine/syncapi.cc	(working copy)
@@ -1086,7 +1086,8 @@
 
   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
@@ -1117,10 +1118,6 @@
   }
 #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());