Change BrowserThreadDelegate to run Init() async.

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 <vector>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
@@ skipping 33 matching lines @@
 
   // All network stack initialization is done on the synchronous Init call when
   // the IO thread is created.
   BrowserThread::SetDelegate(BrowserThread::IO, this);
 }
 
 AwURLRequestContextGetter::~AwURLRequestContextGetter() {
   BrowserThread::SetDelegate(BrowserThread::IO, NULL);
 }
 
+void AwURLRequestContextGetter::InitializeOnUiThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  cookie_store_ = content::CreatePersistentCookieStore(
+      browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cookies")),
+      false,
+      NULL,
+      NULL);
+  cookie_store_->GetCookieMonster()->SetPersistSessionCookies(true);
+
+  // 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).

[awong, 2013/07/11 20:43:48]

This comment is slightly out of date. We're already on the main thread so I
would just say that the goal is to publish to the CookieManager API before any
tasks start getting posted to threads.

+  DidCreateCookieMonster(cookie_store_->GetCookieMonster());
+}
+
 void AwURLRequestContextGetter::Init() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   net::URLRequestContextBuilder builder;
   builder.set_user_agent(content::GetUserAgent(GURL()));
   builder.set_network_delegate(new AwNetworkDelegate());
 #if !defined(DISABLE_FTP_SUPPORT)
   builder.set_ftp_enabled(false);  // Android WebView does not support ftp yet.
 #endif
   builder.set_proxy_config_service(proxy_config_service_.release());
@@ skipping 13 matching lines @@
   net::HttpCache* main_cache = new net::HttpCache(
       network_session_params,
       new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
           cache_type,
           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);
-
-  scoped_refptr<net::CookieStore> cookie_store =
-      content::CreatePersistentCookieStore(
-          browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cookies")),
-          false,
-          NULL,
-          NULL);
-  cookie_store->GetCookieMonster()->SetPersistSessionCookies(true);
-  url_request_context_->set_cookie_store(cookie_store.get());
-
-  // 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());
+  url_request_context_->set_cookie_store(cookie_store_.get());

[joth, 2013/07/16 20:19:52]

url_request_context_->set_cookie_store(cookie_store_.release())

+  // release our copy of cookie_store_, now url_request_context owns it
+  cookie_store_ = NULL;
 }
 
 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 75 matching lines @@
 AwURLRequestContextGetter::GetNetworkTaskRunner() const {
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
 }
 
 void AwURLRequestContextGetter::SetProtocolHandlers(
     content::ProtocolHandlerMap* protocol_handlers) {
   std::swap(protocol_handlers_, *protocol_handlers);
 }
 
 }  // namespace android_webview