Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/chrome/browser/safe_browsing/safe_browsing_service.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 "chrome/browser/safe_browsing/safe_browsing_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 281 matching lines @@
 
 #if defined(FULL_SAFE_BROWSING)
   return new SafeBrowsingDatabaseManager(this);
 #else
   return NULL;
 #endif
 }
 
 void SafeBrowsingService::InitURLRequestContextOnIOThread(
     net::URLRequestContextGetter* system_url_request_context_getter) {
-  using content::CookieStoreConfig;
-
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!url_request_context_.get());
 
   scoped_refptr<net::CookieStore> cookie_store(
-      CreateCookieStore(
-          CookieStoreConfig(CookieFilePath(),
-                            CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
-                            NULL, NULL)));
+      content::CreatePersistentCookieStore(
+          CookieFilePath(),
+          false,
+          NULL,
+          NULL));
 
   url_request_context_.reset(new net::URLRequestContext);
   // |system_url_request_context_getter| may be NULL during tests.
   if (system_url_request_context_getter) {
     url_request_context_->CopyFrom(
         system_url_request_context_getter->GetURLRequestContext());
   }
   url_request_context_->set_cookie_store(cookie_store.get());
 }
 
@@ skipping 159 matching lines @@
 #if defined(FULL_SAFE_BROWSING)
   if (csd_service_.get())
     csd_service_->SetEnabledAndRefreshState(enable);
   if (download_service_.get()) {
     download_service_->SetEnabled(
         enable && !CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisableImprovedDownloadProtection));
   }
 #endif
 }