Data Reduction Proxy Interstitials

chrome/browser/profiles/profile_impl.cc

 // 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.
 
 #include "chrome/browser/profiles/profile_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 94 matching lines @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/page_zoom.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
 #include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"
+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_ui_service.h"

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

Include unconditionally.

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

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

 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/locale_change_guard.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user_manager.h"
 #endif
 
 #if defined(ENABLE_BACKGROUND)
@@ skipping 514 matching lines @@
 
   ChromeNetLog* const net_log = g_browser_process->io_thread()->net_log();
 
   base::Callback<void(bool)> data_reduction_proxy_unavailable;
   scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
       data_reduction_proxy_params;
   scoped_ptr<DataReductionProxyChromeConfigurator> chrome_configurator;
   scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
       data_reduction_proxy_statistics_prefs;
   scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore> event_store;
+#if defined(OS_ANDROID)
+  scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+      data_reduction_proxy_ui_service(

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

Declare for all platforms and instantiate only if Android.

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

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

+          new data_reduction_proxy::DataReductionProxyUIService());
+#endif
   DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings =
       DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this);
   data_reduction_proxy_params =
       data_reduction_proxy_chrome_settings->params()->Clone();
   data_reduction_proxy_unavailable =
       base::Bind(
           &data_reduction_proxy::DataReductionProxySettings::SetUnreachable,
           base::Unretained(data_reduction_proxy_chrome_settings));
   // The event_store is used by DataReductionProxyChromeSettings, configurator,
   // and ProfileIOData. Ownership is passed to the latter via
@@ skipping 47 matching lines @@
 
   io_data_.Init(cookie_path, channel_id_path, cache_path,
                 cache_max_size, media_cache_path, media_cache_max_size,
                 extensions_cookie_path, GetPath(), infinite_cache_path,
                 predictor_, session_cookie_mode, GetSpecialStoragePolicy(),
                 CreateDomainReliabilityMonitor(local_state),
                 data_reduction_proxy_unavailable,
                 chrome_configurator.Pass(),
                 data_reduction_proxy_params.Pass(),
                 data_reduction_proxy_statistics_prefs.Pass(),
+#if defined(OS_ANDROID)

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

Instead of changing the prototype for Android, pass an empty scoped_ptr here,
and check it.

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

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

+                data_reduction_proxy_ui_service.Pass(),
+#endif
                 event_store.Pass());
+
   data_reduction_proxy_chrome_settings->InitDataReductionProxySettings(
       data_reduction_proxy_chrome_configurator,
       prefs_.get(),
       g_browser_process->local_state(),
       GetRequestContext(),
       net_log,
       data_reduction_proxy_event_store);
 
 #if defined(ENABLE_PLUGINS)
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
@@ skipping 689 matching lines @@
 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
   domain_reliability::DomainReliabilityService* service =
       domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
           GetForBrowserContext(this);
   if (!service)
     return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 }