Moved data reduction proxy initialization logic to ProfileImplIOData

chrome/browser/io_thread.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_member.h"
 #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"
 #include "net/http/http_network_session.h"
 #include "net/socket/next_proto.h"
 
 class ChromeNetLog;
 class PrefProxyConfigTracker;
 class PrefService;
 class PrefRegistrySimple;
 class SystemURLRequestContextGetter;
 
 namespace base {
 class CommandLine;
 }
 
 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;
 }
 
 namespace net {
 class CertVerifier;
 class CookieStore;
 class CTVerifier;
 class FtpTransactionFactory;
 class HostMappingRules;
@@ skipping 133 matching lines @@
     Optional<size_t> quic_max_packet_length;
     net::QuicTagVector quic_connection_options;
     Optional<std::string> quic_user_agent_id;
     Optional<net::QuicVersionVector> quic_supported_versions;
     Optional<net::HostPortPair> origin_to_force_quic_on;
     bool enable_user_alternate_protocol_ports;
     // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a
     // 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.
   IOThread(PrefService* local_state,
            policy::PolicyService* policy_service,
            ChromeNetLog* net_log,
            extensions::EventRouterForwarder* extension_event_router_forwarder);
 
   virtual ~IOThread();
 
@@ skipping 222 matching lines @@
   scoped_refptr<net::URLRequestContextGetter>
       system_url_request_context_getter_;
 
   // True if SPDY is disabled by policy.
   bool is_spdy_disabled_by_policy_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   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);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_