Fix for CookieManager init race condition

android_webview/browser/net/aw_url_request_context_getter.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 "android_webview/browser/net/aw_url_request_context_getter.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_request_interceptor.h"
 #include "android_webview/browser/net/aw_network_delegate.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/browser/net/init_native_callback.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
+#include "net/cookies/cookie_store.h"
 #include "net/http/http_cache.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/file_protocol_handler.h"
 #include "net/url_request/protocol_intercept_job_factory.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_context.h"
 
 using content::BrowserThread;
 
@@ skipping 39 matching lines @@
   PopulateNetworkSessionParams(&network_session_params);
   net::HttpCache* main_cache = new net::HttpCache(
       network_session_params,
       new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
           browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cache")),
           10 * 1024 * 1024,  // 10M
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
   main_http_factory_.reset(main_cache);
   url_request_context_->set_http_transaction_factory(main_cache);
+
+  // The CookieMonster must be passed here so it happens synchronously to
+  // the main thread initialization (to avoid race condition in another
+  // thread trying to access the CookieManager API).
+  DidCreateCookieMonster(
+      url_request_context_->cookie_store()->GetCookieMonster());
 }
 
 void AwURLRequestContextGetter::PopulateNetworkSessionParams(
     net::HttpNetworkSession::Params* params) {
   net::URLRequestContext* context = url_request_context_.get();
   params->host_resolver = context->host_resolver();
   params->cert_verifier = context->cert_verifier();
   params->server_bound_cert_service = context->server_bound_cert_service();
   params->transport_security_state = context->transport_security_state();
   params->proxy_service = context->proxy_service();
@@ skipping 26 matching lines @@
     set_protocol = job_factory->SetProtocolHandler(
         chrome::kChromeUIScheme, chrome_protocol_handler_.release());
     DCHECK(set_protocol);
     DCHECK(chrome_devtools_protocol_handler_);
     set_protocol = job_factory->SetProtocolHandler(
         chrome::kChromeDevToolsScheme,
         chrome_devtools_protocol_handler_.release());
     DCHECK(set_protocol);
     // Create a chain of URLRequestJobFactories.  Keep |job_factory_| pointed
     // at the beginning of the chain.
-    job_factory_ = CreateAndroidJobFactoryAndCookieMonster(
-        url_request_context_.get(), job_factory.Pass());
+    job_factory_ = CreateAndroidJobFactory(job_factory.Pass());
     job_factory_.reset(new net::ProtocolInterceptJobFactory(
         job_factory_.Pass(),
         scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
             new AwRequestInterceptor())));
     job_factory_.reset(new net::ProtocolInterceptJobFactory(
         job_factory_.Pass(),
         developer_protocol_handler_.Pass()));
     url_request_context_->set_job_factory(job_factory_.get());
   }
   return url_request_context_.get();
@@ skipping 16 matching lines @@
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_devtools_protocol_handler) {
   blob_protocol_handler_ = blob_protocol_handler.Pass();
   file_system_protocol_handler_ = file_system_protocol_handler.Pass();
   developer_protocol_handler_ = developer_protocol_handler.Pass();
   chrome_protocol_handler_ = chrome_protocol_handler.Pass();
   chrome_devtools_protocol_handler_ = chrome_devtools_protocol_handler.Pass();
 }
 
 }  // namespace android_webview