Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1644)

Unified Diff: chrome/browser/net/chrome_url_request_context.cc

Issue 6749044: Remove async functionality from net::CookiePolicy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/chrome_url_request_context.cc
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 11695b471107f3e4b38d1ee641230b364b171e96..4359be1fe56637f20c87680c19002b787d2f8204 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -8,7 +8,6 @@
#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"
@@ -376,7 +375,6 @@ void ChromeURLRequestContext::CopyFrom(ChromeURLRequestContext* other) {
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());
@@ -387,12 +385,6 @@ void ChromeURLRequestContext::CopyFrom(ChromeURLRequestContext* other) {
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())

Powered by Google App Engine
This is Rietveld 408576698