Moved data reduction proxy initialization logic to ProfileImplIOData

chrome/browser/profiles/profile_impl_io_data.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_PROFILES_PROFILE_IMPL_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "content/public/browser/cookie_store_factory.h"
 
 namespace chrome_browser_net {
 class Predictor;
 }  // namespace chrome_browser_net
 
 namespace content {
 class CookieCryptoDelegate;
 }  // namespace content
 
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+namespace data_reduction_proxy {
+class DataReductionProxyParams;
+class DataReductionProxyUsageStats;
+class DataReductionProxyAuthRequestHandler;
+}
+#endif
+
 namespace domain_reliability {
 class DomainReliabilityMonitor;
 }  // namespace domain_reliability
 
 namespace net {
 class FtpTransactionFactory;
 class HttpServerProperties;
 class HttpServerPropertiesManager;
 class HttpTransactionFactory;
 class SDCHManager;
@@ skipping 19 matching lines @@
               const base::FilePath& media_cache_path,
               int media_cache_max_size,
               const base::FilePath& extensions_cookie_path,
               const base::FilePath& profile_path,
               const base::FilePath& infinite_cache_path,
               chrome_browser_net::Predictor* predictor,
               content::CookieStoreConfig::SessionCookieMode
                   session_cookie_mode,
               quota::SpecialStoragePolicy* special_storage_policy,
               scoped_ptr<domain_reliability::DomainReliabilityMonitor>
-                  domain_reliability_monitor);
+                  domain_reliability_monitor,
+              const base::Callback<void(bool)>&
+                  data_reduction_proxy_unavailable);
 
     // These Create*ContextGetter() functions are only exposed because the
     // circular relationship between Profile, ProfileIOData::Handle, and the
     // ChromeURLRequestContextGetter factories requires Profile be able to call
     // these functions.
     scoped_refptr<ChromeURLRequestContextGetter> CreateMainRequestContextGetter(
         content::ProtocolHandlerMap* protocol_handlers,
         content::URLRequestInterceptorScopedVector request_interceptors,
         PrefService* local_state,
         IOThread* io_thread) const;
@@ skipping 149 matching lines @@
   mutable scoped_ptr<domain_reliability::DomainReliabilityMonitor>
       domain_reliability_monitor_;
 
   mutable scoped_ptr<net::SdchManager> sdch_manager_;
 
   // Parameters needed for isolated apps.
   base::FilePath profile_path_;
   int app_cache_max_size_;
   int app_media_cache_max_size_;
 
+#if defined(SPDY_PROXY_AUTH_ORIGIN)

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

I need to think further about the right layering here. All the member variables
are sensitive to destruction ordering issues, so if your destructors reach into
any other state, or the network delegate or something reaches into these members
during shutdown, we could have a bug. It looks like our ordering is starting to
get a little sloppy here =/

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

ok. Let me know what you conclude...

+  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
+      data_reduction_proxy_params_;
+  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
+      data_reduction_proxy_usage_stats_;
+  mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_;
+
+  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
+      data_reduction_proxy_auth_request_handler_;
+#endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
+
   DISALLOW_COPY_AND_ASSIGN(ProfileImplIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_