Fix for CookieManager init race condition

android_webview/native/net_init_native_callback.cc

Index: android_webview/native/net_init_native_callback.cc
diff --git a/android_webview/native/net_init_native_callback.cc b/android_webview/native/net_init_native_callback.cc
index 585282f06b4232cad7b77bc4b0831818a43144c3..be20a7d9ebc969d9ed756a60cc3d926ad4aee95d 100644
--- a/android_webview/native/net_init_native_callback.cc
+++ b/android_webview/native/net_init_native_callback.cc
@@ -7,15 +7,19 @@
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/native/android_protocol_handler.h"
 #include "android_webview/native/cookie_manager.h"
+#include "base/logging.h"
 #include "net/url_request/url_request_job_factory.h"
 
 namespace android_webview {
 class AwURLRequestJobFactory;
 
-scoped_ptr<net::URLRequestJobFactory> CreateAndroidJobFactoryAndCookieMonster(
-    net::URLRequestContext* context,
+void DidCreateCookieMonster(net::CookieMonster* cookie_monster) {
+  DCHECK(cookie_monster);
+  SetCookieMonsterOnNetworkStackInit(cookie_monster);
+}
+
+scoped_ptr<net::URLRequestJobFactory> CreateAndroidJobFactory(
     scoped_ptr<AwURLRequestJobFactory> job_factory) {
-  SetCookieMonsterOnNetworkStackInit(context);
   return CreateAndroidRequestJobFactory(job_factory.Pass());
 }