Remove async functionality from net::CookiePolicy.

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2011 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/net/chrome_url_request_context.h"
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/browser/net/chrome_cookie_policy.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 #include "net/base/cookie_store.h"
 #include "net/ftp/ftp_transaction_factory.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
@@ skipping 347 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 void ChromeURLRequestContext::CopyFrom(ChromeURLRequestContext* other) {
   URLRequestContext::CopyFrom(other);
 
   // Copy ChromeURLRequestContext parameters.
   set_user_script_dir_path(other->user_script_dir_path());
   set_appcache_service(other->appcache_service());
   set_database_tracker(other->database_tracker());
-  set_chrome_cookie_policy(other->chrome_cookie_policy_);
   set_host_content_settings_map(other->host_content_settings_map());
   set_host_zoom_map(other->host_zoom_map_);
   set_blob_storage_context(other->blob_storage_context());
   set_file_system_context(other->file_system_context());
   set_extension_info_map(other->extension_info_map_);
   set_prerender_manager(other->prerender_manager());
   // ChromeURLDataManagerBackend is unique per context.
   set_is_incognito(other->is_incognito());
 }
 
-void ChromeURLRequestContext::set_chrome_cookie_policy(
-    ChromeCookiePolicy* cookie_policy) {
-  chrome_cookie_policy_ = cookie_policy;  // Take a strong reference.
-  set_cookie_policy(cookie_policy);
-}
-
 ChromeURLDataManagerBackend*
     ChromeURLRequestContext::GetChromeURLDataManagerBackend() {
   if (!chrome_url_data_manager_backend_.get())
     chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend());
   return chrome_url_data_manager_backend_.get();
 }
 
 ChromeURLRequestContext::~ChromeURLRequestContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ skipping 34 matching lines @@
       net::HttpUtil::GenerateAcceptLanguageHeader(accept_language));
 }
 
 void ChromeURLRequestContext::OnDefaultCharsetChange(
     const std::string& default_charset) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   set_referrer_charset(default_charset);
   set_accept_charset(
       net::HttpUtil::GenerateAcceptCharsetHeader(default_charset));
 }