Adding opt out and previews type information to DRP pingback

chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc

Index: chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
index ef5d5c416c517d104df1545a7a32ef83e320887a..72abd601cc5b91ffd66f83ed98f9864d808a7fc3 100644
--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
@@ -351,7 +351,8 @@ void NotifyUIThreadOfRequestComplete(
     const content::GlobalRequestID& request_id,
     ResourceType resource_type,
     bool was_cached,
-    bool used_data_reduction_proxy,
+    std::unique_ptr<data_reduction_proxy::DataReductionProxyData>
+        data_reduction_proxy_data,
     int net_error,
     int64_t total_received_bytes,
     int64_t raw_body_bytes,
@@ -380,9 +381,10 @@ void NotifyUIThreadOfRequestComplete(
       page_load_metrics::MetricsWebContentsObserver::FromWebContents(
           web_contents);
   if (metrics_observer) {
-    metrics_observer->OnRequestComplete(
-        request_id, resource_type, was_cached, used_data_reduction_proxy,
-        raw_body_bytes, original_content_length, request_creation_time);
+    metrics_observer->OnRequestComplete(request_id, resource_type, was_cached,
+                                        std::move(data_reduction_proxy_data),
+                                        raw_body_bytes, original_content_length,
+                                        request_creation_time);
   }
 }
 
@@ -843,9 +845,12 @@ void ChromeResourceDispatcherHostDelegate::RequestComplete(
 
   data_reduction_proxy::DataReductionProxyData* data =
       data_reduction_proxy::DataReductionProxyData::GetData(*url_request);
-  bool used_data_reduction_proxy = data && data->used_data_reduction_proxy();
+  std::unique_ptr<data_reduction_proxy::DataReductionProxyData>
+      data_reduction_proxy_data;
+  if (data)

[Charlie Harrison, 2017/04/20 20:52:50]

Can you comment when this would be null? If this is non-null if a large % of
requests then the Deep Copy is concerning to me, due to the GURL / string copy.

[RyanSturm, 2017/04/20 21:33:00]

I just cut this way down by only adding session key and the URL for main frame
requests in the network_delegate code. It should be ~20-30% of main frame
requests on android (every DRP main frame request) and a low percent on other
platforms.

[Charlie Harrison, 2017/04/20 22:00:52]

Ok that's fine by me.

+    data_reduction_proxy_data = data->DeepCopy();
   int64_t original_content_length =
-      used_data_reduction_proxy
+      data && data->used_data_reduction_proxy()
           ? data_reduction_proxy::util::CalculateEffectiveOCL(*url_request)
           : url_request->GetRawBodyBytes();
 
@@ -854,8 +859,9 @@ void ChromeResourceDispatcherHostDelegate::RequestComplete(
       base::Bind(&NotifyUIThreadOfRequestComplete,
                  info->GetWebContentsGetterForRequest(), url_request->url(),
                  info->GetGlobalRequestID(), info->GetResourceType(),
-                 url_request->was_cached(), used_data_reduction_proxy,
-                 net_error, url_request->GetTotalReceivedBytes(),
+                 url_request->was_cached(),
+                 base::Passed(&data_reduction_proxy_data), net_error,
+                 url_request->GetTotalReceivedBytes(),
                  url_request->GetRawBodyBytes(), original_content_length,
                  url_request->creation_time(),
                  base::TimeTicks::Now() - url_request->creation_time()));