Wrapped data reduction proxy initialization into its own class

chrome/browser/profiles/profile_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_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_path.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/synchronization/lock.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/storage_partition_descriptor.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h"
-#include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"

[sclittle, 2015/01/14 22:54:46]

Remove this

[bengr, 2015/01/15 00:30:31]

Done.

 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_context.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 
 class ChromeHttpUserAgentSettings;
 class ChromeNetworkDelegate;
 class ChromeURLRequestContextGetter;
 class CookieSettings;
 class DevToolsNetworkController;
 class HostContentSettingsMap;
 class MediaDeviceIDSalt;
 class ProtocolHandlerRegistry;
 class SigninNamesOnIOThread;
 class SupervisedUserURLFilter;
 
 namespace chrome_browser_net {
 class ResourcePrefetchPredictorObserver;
 }
 
+namespace data_reduction_proxy {
+class DataReductionProxyIOData;
+}
+
 namespace extensions {
 class InfoMap;
 }
 
 namespace net {
 class CertVerifier;
 class ChannelIDService;
 class CookieStore;
 class FraudulentCertificateReporter;
 class FtpTransactionFactory;
@@ skipping 180 matching lines @@
 
   // Initialize the member needed to track the metrics enabled state. This is
   // only to be called on the UI thread.
   void InitializeMetricsEnabledStateOnUIThread();
 
   // Returns whether or not metrics reporting is enabled in the browser instance
   // on which this profile resides. This is safe for use from the IO thread, and
   // should only be called from there.
   bool GetMetricsEnabledStateOnIOThread() const;
 
-  // Returns whether or not data reduction proxy is enabled in the browser
-  // instance on which this profile resides.
-  virtual bool IsDataReductionProxyEnabled() const;
-
   void set_client_cert_store_factory_for_testing(
     const base::Callback<scoped_ptr<net::ClientCertStore>()>& factory) {
       client_cert_store_factory_ = factory;
   }
 
+  bool IsDataReductionProxyEnabled() {

[sclittle, 2015/01/14 22:54:46]

Make const and define in .cc file

[bengr, 2015/01/15 00:30:31]

Done.

+    return data_reduction_proxy_io_data()->IsEnabled();
+  }
+
  protected:
   // A URLRequestContext for media that owns its HTTP factory, to ensure
   // it is deleted.
   class MediaRequestContext : public net::URLRequestContext {
    public:
     MediaRequestContext();
 
     void SetHttpTransactionFactory(
         scoped_ptr<net::HttpTransactionFactory> http_factory);
 
@@ skipping 88 matching lines @@
   void ShutdownOnUIThread(
       scoped_ptr<ChromeURLRequestContextGetterVector> context_getters);
 
   // A ChannelIDService object is created by a derived class of
   // ProfileIOData, and the derived class calls this method to set the
   // channel_id_service_ member and transfers ownership to the base
   // class.
   void set_channel_id_service(
       net::ChannelIDService* channel_id_service) const;
 
-  data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
-      const {
-    return data_reduction_proxy_params_.get();
-  }
+  void set_data_reduction_proxy_io_data(
+      scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
+          data_reduction_proxy_io_data) const;
 
-  void set_data_reduction_proxy_params(
-      scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
-          data_reduction_proxy_params) const {
-    data_reduction_proxy_params_ = data_reduction_proxy_params.Pass();
-  }
-
-  data_reduction_proxy::DataReductionProxyUsageStats*
-      data_reduction_proxy_usage_stats() const {
-    return data_reduction_proxy_usage_stats_.get();
-  }
-
-  void set_data_reduction_proxy_statistics_prefs(
-      scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
-          data_reduction_proxy_statistics_prefs) {
-    data_reduction_proxy_statistics_prefs_ =
-        data_reduction_proxy_statistics_prefs.Pass();
-  }
-
-  data_reduction_proxy::DataReductionProxyStatisticsPrefs*
-      data_reduction_proxy_statistics_prefs() const {
-    return data_reduction_proxy_statistics_prefs_.get();
-  }
-
-  void set_data_reduction_proxy_usage_stats(
-      scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
-          data_reduction_proxy_usage_stats) const {
-     data_reduction_proxy_usage_stats_ =
-         data_reduction_proxy_usage_stats.Pass();
-  }
-
-  base::Callback<void(bool)> data_reduction_proxy_unavailable_callback() const {
-    return data_reduction_proxy_unavailable_callback_;
-  }
-
-  void set_data_reduction_proxy_unavailable_callback(
-      const base::Callback<void(bool)>& unavailable_callback) const {
-    data_reduction_proxy_unavailable_callback_ = unavailable_callback;
-  }
-
-  data_reduction_proxy::DataReductionProxyConfigurator*
-  data_reduction_proxy_configurator() const {
-    return data_reduction_proxy_configurator_.get();
-  }
-
-  void set_data_reduction_proxy_configurator(
-      scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
-          data_reduction_proxy_configurator) const {
-    data_reduction_proxy_configurator_ =
-        data_reduction_proxy_configurator.Pass();
-  }
-
-  data_reduction_proxy::DataReductionProxyAuthRequestHandler*
-      data_reduction_proxy_auth_request_handler() const {
-    return data_reduction_proxy_auth_request_handler_.get();
-  }
-
-  void set_data_reduction_proxy_auth_request_handler(
-      scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
-          data_reduction_proxy_auth_request_handler) const {
-    data_reduction_proxy_auth_request_handler_ =
-        data_reduction_proxy_auth_request_handler.Pass();
-  }
-
-  data_reduction_proxy::DataReductionProxyEventStore*
-      data_reduction_proxy_event_store() const {
-    return data_reduction_proxy_event_store_.get();
-  }
-
-  void set_data_reduction_proxy_event_store(
-      scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
-          data_reduction_proxy_event_store) const {
-    data_reduction_proxy_event_store_ =
-        data_reduction_proxy_event_store.Pass();
+  data_reduction_proxy::DataReductionProxyIOData*
+  data_reduction_proxy_io_data() const {
+    return data_reduction_proxy_io_data_.get();
   }
 
   net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
     return fraudulent_certificate_reporter_.get();
   }
 
   net::ProxyService* proxy_service() const {
     return proxy_service_.get();
   }
 
@@ skipping 180 matching lines @@
   mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
   mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_;
 #endif
 
   // Pointed to by URLRequestContext.
 #if defined(ENABLE_EXTENSIONS)
   mutable scoped_refptr<extensions::InfoMap> extension_info_map_;
 #endif
   mutable scoped_ptr<net::ChannelIDService> channel_id_service_;
 
-  // data_reduction_proxy_* classes must be declared before |network_delegate_|.
-  // The data_reduction_proxy_* classes are passed in to |network_delegate_|,
-  // so this ordering ensures that the |network_delegate_| never references
-  // freed objects.
-  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
-      data_reduction_proxy_params_;
-  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
-      data_reduction_proxy_usage_stats_;
-  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
-      data_reduction_proxy_statistics_prefs_;
-  mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_;
-  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
-      data_reduction_proxy_configurator_;
-  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
-      data_reduction_proxy_auth_request_handler_;
-  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
-      data_reduction_proxy_event_store_;
+  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
+      data_reduction_proxy_io_data_;
 
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
   mutable scoped_ptr<net::HttpServerProperties>
       http_server_properties_;
 #if defined(OS_CHROMEOS)
   // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
   // case, the verifier is owned by  |cert_verifier_|. Otherwise, set to NULL.
@@ skipping 35 matching lines @@
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   const Profile::ProfileType profile_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_