Chromium Code Reviews| Index: chrome/browser/io_thread.h |
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h |
| index a989118415d9e012be53f51dbe447e739365f57c..5b504f598ff4c1c0ca5d29d41bebbca814b628f8 100644 |
| --- a/chrome/browser/io_thread.h |
| +++ b/chrome/browser/io_thread.h |
| @@ -37,12 +37,10 @@ namespace chrome_browser_net { |
| class DnsProbeService; |
| } |
| -#if defined(SPDY_PROXY_AUTH_ORIGIN) |
| namespace data_reduction_proxy { |
| class DataReductionProxyAuthRequestHandler; |
| class DataReductionProxyParams; |
| } |
| -#endif // defined(SPDY_PROXY_AUTH_ORIGIN) |
| namespace extensions { |
| class EventRouterForwarder; |
| @@ -198,12 +196,10 @@ class IOThread : public content::BrowserThreadDelegate { |
| // main frame load fails with a DNS error in order to provide more useful |
| // information to the renderer so it can show a more specific error page. |
| scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; |
|
mmenke
2014/09/10 15:16:48
Can we get rid of the SPDY_PROXY_AUTH_ORIGIN defin
Not at Google. Contact bengr
2014/09/10 21:38:34
Yes, that is the plan. I have already removed it f
|
| -#if defined(SPDY_PROXY_AUTH_ORIGIN) |
| - scoped_ptr<data_reduction_proxy::DataReductionProxyParams> |
| - data_reduction_proxy_params; |
| - scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> |
| - data_reduction_proxy_auth_request_handler; |
| -#endif |
| + scoped_ptr<data_reduction_proxy::DataReductionProxyParams> |
| + data_reduction_proxy_params; |
| + scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> |
| + data_reduction_proxy_auth_request_handler; |
| }; |
| // |net_log| must either outlive the IOThread or be NULL. |
| @@ -311,6 +307,9 @@ class IOThread : public content::BrowserThreadDelegate { |
| // well as the QUIC field trial group. |
| void ConfigureQuic(const base::CommandLine& command_line); |
| + // Set up data reduction proxy related objects on IO thread globals. |
| + void SetupDataReductionProxy(ChromeNetworkDelegate* network_delegate); |
| + |
| extensions::EventRouterForwarder* extension_event_router_forwarder() { |
| #if defined(ENABLE_EXTENSIONS) |
| return extension_event_router_forwarder_; |