Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/android_webview/browser/aw_browser_context.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/aw_browser_context.h"
 
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_pref_store.h"
 #include "android_webview/browser/aw_quota_manager_bridge.h"
 #include "android_webview/browser/jni_dependency_factory.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "android_webview/browser/net/init_native_callback.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_builder.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/content_constants.h"
-#include "content/public/common/url_constants.h"
-#include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 
 namespace android_webview {
 
 namespace {
 
 // Shows notifications which correspond to PersistentPrefStore's reading errors.
 void HandleReadError(PersistentPrefStore::PrefReadError error) {
 }
 
@@ skipping 54 matching lines @@
 }
 
 // static
 AwBrowserContext* AwBrowserContext::FromWebContents(
     content::WebContents* web_contents) {
   // This is safe; this is the only implementation of the browser context.
   return static_cast<AwBrowserContext*>(web_contents->GetBrowserContext());
 }
 
 void AwBrowserContext::PreMainMessageLoopRun() {
-  url_request_context_getter_ = new AwURLRequestContextGetter(GetPath());
+  cookie_store_ = content::CreatePersistentCookieStore(
+      GetPath().Append(FILE_PATH_LITERAL("Cookies")),
+      true,
+      NULL,
+      NULL);
+  cookie_store_->GetCookieMonster()->SetPersistSessionCookies(true);
+  url_request_context_getter_ =
+      new AwURLRequestContextGetter(GetPath(), cookie_store_.get());
 
-  DidCreateCookieMonster(
-      GetDefaultStoragePartition(this)->GetCookieStoreForScheme(
-          chrome::kHttpScheme)->GetCookieMonster());
+  DidCreateCookieMonster(cookie_store_->GetCookieMonster());
 
   visitedlink_master_.reset(
       new visitedlink::VisitedLinkMaster(this, this, false));
   visitedlink_master_->Init();
 }
 
 void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
   DCHECK(visitedlink_master_);
   visitedlink_master_->AddURLs(urls);
 }
@@ skipping 57 matching lines @@
   pref_service_builder.WithReadErrorCallback(base::Bind(&HandleReadError));
 
   user_prefs::UserPrefs::Set(this,
                              pref_service_builder.Create(pref_registry));
 }
 
 base::FilePath AwBrowserContext::GetPath() const {
   return context_storage_path_;
 }
 
-void AwBrowserContext::OverrideCookieStoreConfigs(
-    const base::FilePath& partition_path,
-    bool in_memory_partition,
-    bool is_default_partition,
-    CookieSchemeMap* configs) {
-  using content::CookieStoreConfig;
-  configs->clear();
-  // 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.
-  (*configs)[content::BrowserContext::kDefaultCookieScheme] =
-      CookieStoreConfig(partition_path.Append(content::kCookieFilename),
-                        CookieStoreConfig::RESTORED_SESSION_COOKIES,
-                        NULL, NULL);
-}
-
 bool AwBrowserContext::IsOffTheRecord() const {
   // Android WebView does not support off the record profile yet.
   return false;
 }
 
 net::URLRequestContextGetter* AwBrowserContext::GetRequestContext() {
   return GetDefaultStoragePartition(this)->GetURLRequestContext();
 }
 
 net::URLRequestContextGetter*
@@ skipping 59 matching lines @@
 
 void AwBrowserContext::RebuildTable(
     const scoped_refptr<URLEnumerator>& enumerator) {
   // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client
   // can change in the lifetime of this WebView and may not yet be set here.
   // Therefore this initialization path is not used.
   enumerator->OnComplete(true);
 }
 
 }  // namespace android_webview