Data Reduction Proxy Interstitials

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.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/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 71 matching lines @@
 #endif
 
 #if defined(USE_SYSTEM_PROTOBUF)
 #include <google/protobuf/repeated_field.h>
 #else
 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/intercept_download_resource_throttle.h"
+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_resource_throttle.h"
+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_ui_service.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/signin/merge_session_throttle.h"
 // TODO(oshima): Enable this for other platforms.
 #include "chrome/browser/renderer_host/offline_resource_throttle.h"
 #endif
 
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::ResourceDispatcherHostLoginDelegate;
 using content::ResourceRequestInfo;
 using content::ResourceType;
 
 #if defined(ENABLE_EXTENSIONS)
 using extensions::Extension;
 using extensions::StreamsPrivateAPI;
 #endif
 
 #if defined(OS_ANDROID)

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

Remove #if defined.

Remove usings. Better to spell it all out where you use it.

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

Done.

+using data_reduction_proxy::DataReductionProxyParams;
+using data_reduction_proxy::DataReductionProxyResourceThrottle;
 using navigation_interception::InterceptNavigationDelegate;
 #endif
 
 namespace {
 
 ExternalProtocolHandler::Delegate* g_external_protocol_handler_delegate = NULL;
 
 void NotifyDownloadInitiatedOnUI(int render_process_id, int render_view_id) {
   RenderViewHost* rvh = RenderViewHost::FromID(render_process_id,
                                                render_view_id);
@@ skipping 393 matching lines @@
     content::ResourceThrottle* throttle =
         SafeBrowsingResourceThrottleFactory::Create(request,
                                                     resource_context,
                                                     resource_type,
                                                     safe_browsing_.get());
     if (throttle)
       throttles->push_back(throttle);
   }
 #endif
 
+#if defined(OS_ANDROID)

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

Remove #if defined.

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

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

+  if (io_data->IsDataReductionProxyEnabled() &&
+      DataReductionProxyParams::IsIncludedInBypassWarningTrial()) {
+    DataReductionProxyParams* params = io_data->data_reduction_proxy_params();
+    data_reduction_proxy::DataReductionProxyUIService* service =
+        io_data->data_reduction_proxy_ui_service();
+
+    if (params && service) {
+      throttles->push_back(new DataReductionProxyResourceThrottle(
+          request, resource_type, service, params));
+    }
+

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

Remove blank line.

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

Done.

+  }
+#endif
+
 #if defined(ENABLE_SUPERVISED_USERS)
   bool is_subresource_request =
       resource_type != content::RESOURCE_TYPE_MAIN_FRAME;
   throttles->push_back(new SupervisedUserResourceThrottle(
         request, !is_subresource_request,
         io_data->supervised_user_url_filter()));
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
   content::ResourceThrottle* throttle =
@@ skipping 220 matching lines @@
                                        url_request->GetTotalReceivedBytes()));
   }
 }
 
 // static
 void ChromeResourceDispatcherHostDelegate::
     SetExternalProtocolHandlerDelegateForTesting(
     ExternalProtocolHandler::Delegate* delegate) {
   g_external_protocol_handler_delegate = delegate;
 }