Moved data reduction proxy initialization logic to ProfileImplIOData

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 6152d1305e3d9f39bcdddbafec574f2fe3903d94..38a9f30f148a31a48169fc1b920264835759456e 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -17,9 +17,6 @@
 #include "base/time/time.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
-#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_usage_stats.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_thread_delegate.h"
 #include "net/base/network_change_notifier.h"
@@ -40,6 +37,13 @@ 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;
 }
@@ -193,13 +197,6 @@ 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;
-    scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
-        data_reduction_proxy_params;
-    scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
-        data_reduction_proxy_usage_stats;
-    scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
-        data_reduction_proxy_auth_request_handler;
-    ChromeNetworkDelegate::OnResolveProxyHandler on_resolve_proxy_handler;
   };
 
   // |net_log| must either outlive the IOThread or be NULL.
@@ -442,6 +439,14 @@ class IOThread : public content::BrowserThreadDelegate {
 
   const base::TimeTicks creation_time_;
 
+#if defined(SPDY_PROXY_AUTH_ORIGIN)

[willchan no longer on Chromium, 2014/07/28 15:45:22]

Why did this get moved down here? This is probably a bug. All these members are
UI thread objects. IOThread is a UI thread object that manages the IO thread.
Anything that is a member in IOThread will be destroyed on the UI thread.
IOThread::Globals is set of data that will be constructed and destroyed on the
IO thread.

Since these members were previously constructed in IOThread::InitAsync(), and
they're used by the NetworkDelegate, I suspect you want to keep them on the IO
thread rather than move them to the UI thread.

[bengr, 2014/07/28 20:29:03]

Done.

+  scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
+      data_reduction_proxy_params_;
+
+  scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
+      data_reduction_proxy_auth_request_handler_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };