Data Reduction Proxy Interstitials

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>
@@ skipping 17 matching lines @@
 #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"
 
+#if defined(OS_ANDROID)

[bengr, 2014/12/17 00:30:19]

Remove the #if defined

[megjablon, 2014/12/23 02:18:03]

We decided not to have a base class as discussed offline.

+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_ui_service.h"
+#endif
+
 class ChromeHttpUserAgentSettings;
 class ChromeNetworkDelegate;
 class ChromeURLRequestContextGetter;
 class CookieSettings;
 class DevToolsNetworkController;
 class HostContentSettingsMap;
 class MediaDeviceIDSalt;
 class ProtocolHandlerRegistry;
 class SigninNamesOnIOThread;
 class SupervisedUserURLFilter;
@@ skipping 155 matching lines @@
   content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const;
 
   DevToolsNetworkController* network_controller() const {
     return network_controller_.get();
   }
 
   net::TransportSecurityState* transport_security_state() const {
     return transport_security_state_.get();
   }
 
+  data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
+      const {
+    return data_reduction_proxy_params_.get();
+  }
+
+#if defined(OS_ANDROID)

[bengr, 2014/12/17 00:30:19]

Remove the #if defined

[megjablon, 2014/12/23 02:18:03]

We decided not to have a base class as discussed offline.

+  data_reduction_proxy::DataReductionProxyUIService*
+  data_reduction_proxy_ui_service() const {
+    return data_reduction_proxy_ui_service_.get();
+  }
+#endif
+
 #if defined(OS_CHROMEOS)
   std::string username_hash() const {
     return username_hash_;
   }
 
   bool use_system_key_slot() const { return use_system_key_slot_; }
 #endif
 
   Profile::ProfileType profile_type() const {
     return profile_type_;
@@ skipping 141 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_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();
   }
@@ skipping 48 matching lines @@
           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();
   }
 
+#if defined(OS_ANDROID)

[bengr, 2014/12/17 00:30:19]

Remove the #if defined

[megjablon, 2014/12/23 02:18:03]

We decided not to have a base class as discussed offline.

+  void set_data_reduction_proxy_ui_service(
+      scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+          data_reduction_proxy_ui_service) const {
+    data_reduction_proxy_ui_service_ =
+        data_reduction_proxy_ui_service.Pass();
+  }
+#endif
+
   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();
   }
 
   net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
     return fraudulent_certificate_reporter_.get();
   }
@@ skipping 203 matching lines @@
       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::DataReductionProxyAuthRequestHandler>
       data_reduction_proxy_auth_request_handler_;
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
       data_reduction_proxy_event_store_;
+#if defined(OS_ANDROID)

[bengr, 2014/12/17 00:30:19]

Remove the #if defined. Also add a comment that this must be declared after the
DataReductionProxyChromeConfigurator, because the configurator must be valid for
its entire lifetime.

[megjablon, 2014/12/23 02:18:03]

Done.

+  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+      data_reduction_proxy_ui_service_;
+#endif
 
   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_