Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/chrome/browser/io_thread.cc

Index: trunk/src/chrome/browser/io_thread.cc
===================================================================
--- trunk/src/chrome/browser/io_thread.cc	(revision 219785)
+++ trunk/src/chrome/browser/io_thread.cc	(working copy)
@@ -45,12 +45,12 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/cookie_store_factory.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/net_util.h"
 #include "net/base/network_time_notifier.h"
 #include "net/base/sdch_manager.h"
 #include "net/cert/cert_verifier.h"
+#include "net/cookies/cookie_monster.h"
 #include "net/dns/host_cache.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/mapped_host_resolver.h"
@@ -534,8 +534,7 @@
   globals_->proxy_script_fetcher_proxy_service.reset(
       net::ProxyService::CreateDirectWithNetLog(net_log_));
   // In-memory cookie store.
-  globals_->system_cookie_store =
-      content::CreateCookieStore(content::CookieStoreConfig());
+  globals_->system_cookie_store = new net::CookieMonster(NULL, NULL);
   // In-memory server bound cert store.
   globals_->system_server_bound_cert_service.reset(
       new net::ServerBoundCertService(
@@ -678,6 +677,12 @@
 }
 
 void IOThread::InitializeNetworkOptions(const CommandLine& command_line) {
+  if (command_line.HasSwitch(switches::kEnableFileCookies)) {
+    // Enable cookie storage for file:// URLs.  Must do this before the first
+    // Profile (and therefore the first CookieMonster) is created.
+    net::CookieMonster::EnableFileScheme();
+  }
+
   // Only handle use-spdy command line flags if "spdy.disabled" preference is
   // not disabled via policy.
   if (!is_spdy_disabled_by_policy_) {