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

Unified Diff: chrome/browser/io_thread.cc

Issue 332313003: Add Finch experiment for selectively bypassing proxies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bengr's nit Created 6 years, 5 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/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 7c918c7d73ffab946e74f87e714365b06f58ad25..617d31a6dc483143f60b52ee474d5c7361170d0a 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -94,6 +94,7 @@
#if defined(OS_ANDROID) || defined(OS_IOS)
#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_protocol.h"
#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
#endif
@@ -628,6 +629,9 @@ void IOThread::InitAsync() {
globals_->data_reduction_proxy_params.reset(proxy_params);
globals_->data_reduction_proxy_auth_request_handler.reset(
new DataReductionProxyAuthRequestHandler(proxy_params));
+ globals_->on_resolve_proxy_handler.reset(
+ new ChromeNetworkDelegate::OnResolveProxyHandler(
+ base::Bind(data_reduction_proxy::OnResolveProxyHandler)));
DataReductionProxyUsageStats* proxy_usage_stats =
new DataReductionProxyUsageStats(proxy_params,
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
@@ -637,6 +641,8 @@ void IOThread::InitAsync() {
network_delegate->set_data_reduction_proxy_usage_stats(proxy_usage_stats);
network_delegate->set_data_reduction_proxy_auth_request_handler(
globals_->data_reduction_proxy_auth_request_handler.get());
+ network_delegate->set_on_resolve_proxy_handler(
+ globals_->on_resolve_proxy_handler.get());
#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
#endif // defined(OS_ANDROID) || defined(OS_IOS)
globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory(

Powered by Google App Engine
This is Rietveld 408576698