Adding opt out and previews type information to DRP pingback

chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc

 // Copyright 2016 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/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h"
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 54 matching lines @@
 
   void SimulatePageLoad(bool is_restore, bool simulate_app_background) {
     is_restore_ = is_restore;
     NavigateAndCommit(GURL(kDefaultTestUrl));
     SimulateTimingUpdate(timing_);
 
     // Prepare 4 resources of varying size and configurations.
     page_load_metrics::ExtraRequestInfo resources[] = {
         // Cached request.
         {true /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
-         false /* data_reduction_proxy_used*/,
-         0 /* original_network_content_length */},
+         0 /* original_network_content_length */,
+         nullptr /* data_reduction_proxy_data */},
         // Uncached non-proxied request.
         {false /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
-         false /* data_reduction_proxy_used*/,
-         1024 * 40 /* original_network_content_length */},
+         1024 * 40 /* original_network_content_length */,
+         nullptr /* data_reduction_proxy_data */},
         // Uncached proxied request with .1 compression ratio.
         {false /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
-         false /* data_reduction_proxy_used*/,
-         1024 * 40 /* original_network_content_length */},
+         1024 * 40 /* original_network_content_length */,
+         nullptr /* data_reduction_proxy_data */},
         // Uncached proxied request with .5 compression ratio.
         {false /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
-         false /* data_reduction_proxy_used*/,
-         1024 * 40 /* original_network_content_length */},
+         1024 * 40 /* original_network_content_length */,
+         nullptr /* data_reduction_proxy_data */},
     };
 
-    for (auto request : resources) {
+    for (const auto& request : resources) {
       SimulateLoadedResource(request);
       if (!request.was_cached) {
         network_bytes_ += request.raw_body_bytes;
       } else {
         cache_bytes_ += request.raw_body_bytes;
       }
     }
 
     if (simulate_app_background) {
       // The histograms should be logged when the app is backgrounded.
@@ skipping 51 matching lines @@
   histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.TabRestore.Experimental.Bytes.Network",
       static_cast<int>(network_bytes_ / 1024), 1);
   histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.TabRestore.Experimental.Bytes.Cache",
       static_cast<int>(cache_bytes_ / 1024), 1);
   histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.TabRestore.Experimental.Bytes.Total",
       static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1);
 }