Fix for CookieManager init race condition

android_webview/native/cookie_manager.cc

 // Copyright (c) 2011 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/native/cookie_manager.h"
 
 #include "android_webview/browser/aw_cookie_access_policy.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_constants.h"
 #include "jni/AwCookieManager_jni.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_options.h"
-#include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertJavaStringToUTF16;
 using content::BrowserThread;
 using net::CookieList;
 using net::CookieMonster;
 
 // In the future, we may instead want to inject an explicit CookieStore
 // dependency into this object during process initialization to avoid
 // depending on the URLRequestContext.
 // See issue http://crbug.com/157683
 
 // All functions on the CookieManager can be called from any thread, including
 // threads without a message loop. BrowserThread::FILE is used to call methods
 // on CookieMonster that needs to be called, and called back, on a chrome
 // thread.
 
 namespace android_webview {
 
 namespace {
 
 class CookieManager {
  public:
   static CookieManager* GetInstance();
 
-  void SetCookieMonster(net::URLRequestContext* request_context);
+  void SetCookieMonster(net::CookieMonster* cookie_monster);
 
   void SetAcceptCookie(bool accept);
   bool AcceptCookie();
   void SetCookie(const GURL& host, const std::string& cookie_value);
   std::string GetCookie(const GURL& host);
   void RemoveSessionCookie();
   void RemoveAllCookie();
   void RemoveExpiredCookie();
   void FlushCookieStore();
   bool HasCookies();
@@ skipping 65 matching lines @@
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(task, wait_for_completion ? &completion : NULL));
 
   if (wait_for_completion) {
     ScopedAllowWaitForLegacyWebViewApi wait;
     completion.Wait();
   }
 }
 
-void CookieManager::SetCookieMonster(net::URLRequestContext* request_context) {
+void CookieManager::SetCookieMonster(net::CookieMonster* cookie_monster) {
   DCHECK(!cookie_monster_);
-  cookie_monster_ = request_context->cookie_store()->GetCookieMonster();
+  cookie_monster_ = cookie_monster;
 }
 
 void CookieManager::SetAcceptCookie(bool accept) {
   AwCookieAccessPolicy::GetInstance()->SetGlobalAllowAccess(accept);
 }
 
 bool CookieManager::AcceptCookie() {
   return AwCookieAccessPolicy::GetInstance()->GetGlobalAllowAccess();
 }
 
@@ skipping 191 matching lines @@
 
 static jboolean AllowFileSchemeCookies(JNIEnv* env, jobject obj) {
   return CookieManager::GetInstance()->AllowFileSchemeCookies();
 }
 
 static void SetAcceptFileSchemeCookies(JNIEnv* env, jobject obj,
                                        jboolean accept) {
   return CookieManager::GetInstance()->SetAcceptFileSchemeCookies(accept);
 }
 
-void SetCookieMonsterOnNetworkStackInit(net::URLRequestContext* context) {
-  CookieManager::GetInstance()->SetCookieMonster(context);
+void SetCookieMonsterOnNetworkStackInit(net::CookieMonster* cookie_monster) {
+  CookieManager::GetInstance()->SetCookieMonster(cookie_monster);
 }
 
 bool RegisterCookieManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // android_webview namespace