components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc - Issue 1735203002: Revert of Moving proxy resolution logic out of NetworkDelegate and into ProxyDelegate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc

Issue 1735203002: Revert of Moving proxy resolution logic out of NetworkDelegate and into ProxyDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc

index aff833d5d6599d5488bad0387448e70b0c7d6971..7d378f711d5a2ae95a1ec2df2d22520317fa5405 100644

--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc

+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc

@@ -29,7 +29,6 @@

#include "net/base/load_flags.h"

#include "net/base/network_change_notifier.h"

#include "net/base/network_delegate.h"

-#include "net/base/proxy_delegate.h"

#include "net/http/http_response_headers.h"

#include "net/http/http_transaction_test_util.h"

#include "net/proxy/proxy_server.h"

@@ -783,8 +782,6 @@

.WithMockClientSocketFactory(mock_socket_factory_.get())

.WithURLRequestContext(context_.get())

.Build();

- proxy_delegate_ = drp_test_context_->io_data()->CreateProxyDelegate();

- context_->set_proxy_delegate(proxy_delegate_.get());

}

void AttachToContextAndInit() {

@@ -806,7 +803,6 @@

scoped_ptr<net::TestURLRequestContext> context_;

scoped_ptr<net::URLRequestContextStorage> storage_;

scoped_ptr<net::MockClientSocketFactory> mock_socket_factory_;

- scoped_ptr<net::ProxyDelegate> proxy_delegate_;

scoped_ptr<DataReductionProxyTestContext> drp_test_context_;

DISALLOW_COPY_AND_ASSIGN(DataReductionProxyBypassProtocolEndToEndTest);