summaryrefslogtreecommitdiffstats
path: root/components/data_reduction_proxy/content/browser
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-03-23 11:48:36 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-23 18:49:16 +0000
commit151423e1851b45000257ef2d32ee0984a24133c7 (patch)
treecea7e7af8cf5771d650b8a72ebf74a887a4b8f94 /components/data_reduction_proxy/content/browser
parent8758634a7c0c79481469f50c9c8f1c580169adec (diff)
downloadchromium_src-151423e1851b45000257ef2d32ee0984a24133c7.zip
chromium_src-151423e1851b45000257ef2d32ee0984a24133c7.tar.gz
chromium_src-151423e1851b45000257ef2d32ee0984a24133c7.tar.bz2
Remove prerender cookie store, part 4.
This removes the ability to pass in a custom CookieStore to a URLRequest. It's a small change to net/url_request which then balloons to everything in the project that ever makes a URLRequest. This reverts the rest of https://codereview.chromium.org/188693003 (and then does a whole lot more because URLRequest constructors were unified recently to always require passing in the fourth argument). BUG=457344 Review URL: https://codereview.chromium.org/1003953008 Cr-Commit-Position: refs/heads/master@{#321820}
Diffstat (limited to 'components/data_reduction_proxy/content/browser')
-rw-r--r--components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc2
-rw-r--r--components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc
index cca6bfa..e7e3789 100644
--- a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc
+++ b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc
@@ -73,7 +73,7 @@ class DataReductionProxyDebugResourceThrottleTest : public testing::Test {
.WithMockConfig()
.Build();
request_ = context_.CreateRequest(GURL("http://www.google.com/"), net::IDLE,
- &delegate_, NULL);
+ &delegate_);
ui_service_.reset(new ContentDataReductionProxyDebugUIService(
base::Bind(
&DataReductionProxyDebugResourceThrottleTest::
diff --git a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc
index a6caefe..d0da16b 100644
--- a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc
+++ b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc
@@ -62,7 +62,7 @@ class DataReductionProxyDebugUIManagerTest
public:
DataReductionProxyDebugUIManagerTest()
: state_(NOT_CALLED),
- request_(context_.CreateRequest(GURL(), net::IDLE, &delegate_, NULL)) {
+ request_(context_.CreateRequest(GURL(), net::IDLE, &delegate_)) {
ui_manager_ = new TestDataReductionProxyDebugUIManager(
content::BrowserThread::GetMessageLoopProxyForThread(
content::BrowserThread::UI),