Add CookieStoreConfig to unify API for in-memory and persistent CookieStore Creation.

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_browser_context.h"
 #include "android_webview/browser/aw_cookie_access_policy.h"
 #include "android_webview/browser/net/init_native_callback.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
@@ skipping 167 matching lines @@
     const FilePath& user_data_dir,
     const scoped_refptr<base::SequencedTaskRunner>& client_task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& background_task_runner) {
   FilePath cookie_store_path =
       user_data_dir.Append(FILE_PATH_LITERAL("Cookies"));
 
   background_task_runner->PostTask(
       FROM_HERE,
       base::Bind(ImportLegacyCookieStore, cookie_store_path));
 
-  net::CookieStore* cookie_store = content::CreatePersistentCookieStore(
-    cookie_store_path,
-    true,
-    NULL,
-    NULL,
-    client_task_runner,
-    background_task_runner,
-    scoped_ptr<content::CookieCryptoDelegate>());
+  content::CookieStoreConfig cookie_config(
+      cookie_store_path,
+      content::CookieStoreConfig::RESTORED_SESSION_COOKIES,
+      NULL, NULL);
+  cookie_config.client_task_runner = client_task_runner;
+  cookie_config.background_task_runner = background_task_runner;
+  net::CookieStore* cookie_store = content::CreateCookieStore(cookie_config);
   cookie_monster_ = cookie_store->GetCookieMonster();
-  cookie_monster_->SetPersistSessionCookies(true);
   SetAcceptFileSchemeCookiesLocked(kDefaultFileSchemeAllowed);
 }
 
 void CookieManager::EnsureCookieMonsterExistsLocked() {
   cookie_monster_lock_.AssertAcquired();
   if (cookie_monster_.get()) {
     return;
   }
 
   // Create cookie monster using WebView-specific threads, as the rest of the
@@ skipping 289 matching lines @@
     AwBrowserContext* browser_context) {
   return CookieManager::GetInstance()->CreateBrowserThreadCookieStore(
       browser_context);
 }
 
 bool RegisterCookieManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // android_webview namespace