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

android_webview/native/cookie_manager.cc

Index: android_webview/native/cookie_manager.cc
diff --git a/android_webview/native/cookie_manager.cc b/android_webview/native/cookie_manager.cc
index 4e16a9f73c9d516e9944f3bd9a78831bc5561c9f..310cb431c89559958ed31a68228f666f3c8d13da 100644
--- a/android_webview/native/cookie_manager.cc
+++ b/android_webview/native/cookie_manager.cc
@@ -185,16 +185,14 @@ void CookieManager::CreateCookieMonster(
       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);
 }