Remove the Extensions URLRequestContext

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"
 #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 "android_webview/common/aw_switches.h"
 #include "base/command_line.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/cache_type.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"
@@ skipping 16 matching lines @@
   BrowserThread::SetDelegate(BrowserThread::IO, this);
 }
 
 AwURLRequestContextGetter::~AwURLRequestContextGetter() {
   BrowserThread::SetDelegate(BrowserThread::IO, NULL);
 }
 
 void AwURLRequestContextGetter::Init() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  cookie_store_ = content::CreatePersistentCookieStore(
-      browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cookies")),
-      true,
-      NULL,
-      NULL);
-  cookie_store_->GetCookieMonster()->SetPersistSessionCookies(true);
+  // By default session cookies are always restored. An Android application can
+  // control this policy by calling CookieManager.removeSessionCookie() when
+  // Activity.onCreate() is called with savedInstanceState == null.
+  cookie_store_ = content::CreateCookieStore(
+      content::CookieStoreConfig(
+          browser_context_->GetPath().Append(content::kCookieFilename),
+          content::CookieStoreConfig::RESTORED_SESSION_COOKIES,
+          NULL,
+          NULL));
 
   // 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(cookie_store_->GetCookieMonster());
 }
 
 void AwURLRequestContextGetter::InitAsync() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ skipping 116 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