Adding opt out and previews type information to DRP pingback

chrome/browser/page_load_metrics/page_load_metrics_observer.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_METRICS_OBSERVER_H_
 #define CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_METRICS_OBSERVER_H_
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "chrome/common/page_load_metrics/page_load_timing.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_data.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "url/gurl.h"
 
 namespace page_load_metrics {
 
 // This enum represents how a page load ends. If the action occurs before the
 // page load finishes (or reaches some point like first paint), then we consider
 // the load to be aborted.
@@ skipping 169 matching lines @@
   const PageLoadMetadata main_frame_metadata;
 
   // PageLoadMetadata for child frames of the current page load.
   const PageLoadMetadata child_frame_metadata;
 };
 
 // Container for various information about a request within a page load.
 struct ExtraRequestInfo {
   ExtraRequestInfo(bool was_cached,
                    int64_t raw_body_bytes,
-                   bool data_reduction_proxy_used,
-                   int64_t original_network_content_length);
-
-  ExtraRequestInfo(const ExtraRequestInfo& other);

[RyanSturm, 2017/04/20 20:30:32]

csharrison@, I removed this, but I can add it back and leave it as = default; I
just need to add a copy constructor for DataReductionProxyData, but it seemed
like there wasn't a good reason to have a copy constructor as far as I could
tell.

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

Fine by me. I think we only use it for for loops :P

+                   int64_t original_network_content_length,
+                   std::unique_ptr<data_reduction_proxy::DataReductionProxyData>

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

#include <memory>

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

Done.

+                       data_reduction_proxy_data);
 
   ~ExtraRequestInfo();
 
   // True if the resource was loaded from cache.
   const bool was_cached;
 
   // The number of body (not header) prefilter bytes.
   const int64_t raw_body_bytes;
 
-  // Whether this request used Data Reduction Proxy.
-  const bool data_reduction_proxy_used;
-
   // The number of body (not header) bytes that the data reduction proxy saw
   // before it compressed the requests.
   const int64_t original_network_content_length;
+
+  // Data related to data saver.
+  const std::unique_ptr<data_reduction_proxy::DataReductionProxyData>
+      data_reduction_proxy_data;
 };
 
 // Interface for PageLoadMetrics observers. All instances of this class are
 // owned by the PageLoadTracker tracking a page load.
 class PageLoadMetricsObserver {
  public:
   // ObservePolicy is used as a return value on some PageLoadMetricsObserver
   // callbacks to indicate whether the observer would like to continue observing
   // metric callbacks. Observers that wish to continue observing metric
   // callbacks should return CONTINUE_OBSERVING; observers that wish to stop
@@ skipping 144 matching lines @@
       const FailedProvisionalLoadInfo& failed_provisional_load_info,
       const PageLoadExtraInfo& extra_info) {}
 
   // Called whenever a request is loaded for this page load.
   virtual void OnLoadedResource(const ExtraRequestInfo& extra_request_info) {}
 };
 
 }  // namespace page_load_metrics
 
 #endif  // CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_METRICS_OBSERVER_H_