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 74 matching lines @@
 #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/navigation_interception/intercept_navigation_delegate.h"
 #endif
 
+#if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.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;
@@ skipping 415 matching lines @@
     content::ResourceThrottle* throttle =
         SafeBrowsingResourceThrottleFactory::Create(request,
                                                     resource_context,
                                                     resource_type,
                                                     safe_browsing_.get());
     if (throttle)
       throttles->push_back(throttle);
   }
 #endif
 
+#if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
+  scoped_ptr<content::ResourceThrottle> data_reduction_proxy_throttle =
+      data_reduction_proxy::DataReductionProxyDebugResourceThrottle::
+          MaybeCreate(
+              io_data->IsDataReductionProxyEnabled(),
+              request, resource_type,
+              io_data->data_reduction_proxy_io_data()->debug_ui_service(),
+              io_data->data_reduction_proxy_io_data()->params());

[mmenke, 2015/02/02 15:45:53]

Rather than dig into data_reduction_proxy_io_data's guts, can we just pass in
io_data->data_reduction_proxy_io_data() here, and have
DataReductionProxyDebugResourceThrottle get what it needs from it?

Same goes for io_data->IsDataReductionProxyEnabled():  The
data_reduction_proxy_io_data already knows if it's enabled, so this should just
be:

MaybeCreate(request, resource_type, io_data->data_reduction_proxy_io_data())

Then you can also get rid of the data_reduction_proxy_io_data.h include, though
you'll still need the other one.

[megjablon, 2015/02/03 23:21:27]

Done.

+  if (data_reduction_proxy_throttle)
+    throttles->push_back(data_reduction_proxy_throttle.release());
+#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 214 matching lines @@
                                        url_request->GetTotalReceivedBytes()));
   }
 }
 
 // static
 void ChromeResourceDispatcherHostDelegate::
     SetExternalProtocolHandlerDelegateForTesting(
     ExternalProtocolHandler::Delegate* delegate) {
   g_external_protocol_handler_delegate = delegate;
 }