Make Data Reduction Proxy a best effort proxy

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/net/spdyproxy/data_reduction_proxy_chrome_configurator.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"

[mmenke, 2015/01/05 15:42:42]

Can't this be forward declared, and then included in the CC file (Needed there
for destruction, I believe)

[bengr, 2015/01/05 23:28:37]

Done.

 #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 "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"
@@ skipping 371 matching lines @@
 
   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;
   }
 
-  DataReductionProxyChromeConfigurator*
-      data_reduction_proxy_chrome_configurator() const {
-    return data_reduction_proxy_chrome_configurator_.get();
+  data_reduction_proxy::DataReductionProxyConfigurator*
+  data_reduction_proxy_configurator() const {
+    return data_reduction_proxy_configurator_.get();
   }
 
-  void set_data_reduction_proxy_chrome_configurator(
-      scoped_ptr<DataReductionProxyChromeConfigurator>
-          data_reduction_proxy_chrome_configurator) const {
-    data_reduction_proxy_chrome_configurator_ =
-        data_reduction_proxy_chrome_configurator.Pass();
+  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 {
@@ skipping 216 matching lines @@
   // 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<DataReductionProxyChromeConfigurator>
-      data_reduction_proxy_chrome_configurator_;
+  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<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>
@@ skipping 39 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_