Index: chrome/browser/io_thread.h |
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h |
index a989118415d9e012be53f51dbe447e739365f57c..02254e7f63dbf86d194b75f9a43aa18c2ca4e948 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; |
-#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; |
mmenke
2014/09/08 18:11:14
nit: These 4 lines should all be indented by 2 mo
Not at Google. Contact bengr
2014/09/08 19:18:35
Done.
|
-#endif |
}; |
// |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_; |