Adding opt out and previews type information to DRP pingback

chrome/browser/loader/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/loader/chrome_resource_dispatcher_host_delegate.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 333 matching lines @@
     }
   }
 }
 
 void NotifyUIThreadOfRequestComplete(
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     const GURL& url,
     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,
     int64_t original_content_length,
     base::TimeTicks request_creation_time,
     base::TimeDelta request_loading_time) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   content::WebContents* web_contents = web_contents_getter.Run();
   if (!web_contents)
     return;
   if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME) {
     LogMainFrameMetricsOnUIThread(url, net_error, request_loading_time,
                                   web_contents);
   }
   if (!was_cached) {
     UpdatePrerenderNetworkBytesCallback(web_contents, total_received_bytes);
 #if defined(OS_ANDROID)
     offline_pages::BackgroundLoaderOffliner* background_loader =
         offline_pages::BackgroundLoaderOffliner::FromWebContents(web_contents);
 
     if (background_loader)
       background_loader->OnNetworkBytesChanged(total_received_bytes);
 #endif  // OS_ANDROID
   }
   page_load_metrics::MetricsWebContentsObserver* metrics_observer =
       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);
   }
 }
 
 }  // namespace
 
 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
     : download_request_limiter_(g_browser_process->download_request_limiter()),
       safe_browsing_(g_browser_process->safe_browsing_service())
 #if BUILDFLAG(ENABLE_EXTENSIONS)
       , user_script_listener_(new extensions::UserScriptListener())
@@ skipping 420 matching lines @@
   if (!url_request)
     return;
   // TODO(maksims): remove this and use net_error argument in RequestComplete
   // once ResourceDispatcherHostDelegate is modified.
   int net_error = url_request->status().error();
   const ResourceRequestInfo* info =
       ResourceRequestInfo::ForRequest(url_request);
 
   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)
+    data_reduction_proxy_data = data->DeepCopy();

[bengr, 2017/04/20 23:19:35]

It's too bad you have to pass along the session key, which isn't used by this
code.

[RyanSturm, 2017/04/21 16:25:04]

It's only for main frame requests, but still unfortunate. The main frame request
is also copied elsewhere (but all fields are used for those copies).

   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();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&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()));
 }
 
 content::PreviewsState ChromeResourceDispatcherHostDelegate::GetPreviewsState(
     const net::URLRequest& url_request,
     content::ResourceContext* resource_context) {
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
   data_reduction_proxy::DataReductionProxyIOData* data_reduction_proxy_io_data =
@@ skipping 65 matching lines @@
             &ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad,
             base::Unretained(this), url, request_loading_time));
     return;
   }
 
   std::string metric_name = (request_loading_time.InMilliseconds() < 100 ?
       "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow");
   rappor::SampleDomainAndRegistryFromGURL(
       g_browser_process->rappor_service(), metric_name, url);
 }