[PageLoadMetrics] Keep track of Ad Sizes on Pages

chrome/browser/page_load_metrics/page_load_metrics_observer.cc

 // 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.
 
 #include "chrome/browser/page_load_metrics/page_load_metrics_observer.h"
 
 namespace page_load_metrics {
 
 PageLoadExtraInfo::PageLoadExtraInfo(
     base::TimeTicks navigation_start,
@@ skipping 36 matching lines @@
       base::Optional<base::TimeDelta>() /* first_background_time */,
       base::Optional<base::TimeDelta>() /* first_foreground_time */,
       started_in_foreground /* started_in_foreground */,
       UserInitiatedInfo::BrowserInitiated(), url, url, true /* did_commit */,
       page_load_metrics::END_NONE,
       page_load_metrics::UserInitiatedInfo::NotUserInitiated(),
       base::TimeDelta(), page_load_metrics::PageLoadMetadata(),
       page_load_metrics::PageLoadMetadata());
 }
 
-ExtraRequestInfo::ExtraRequestInfo(bool was_cached,
+ExtraRequestInfo::ExtraRequestInfo(const GURL& url,
+                                   int frame_tree_node_id,
+                                   bool was_cached,
                                    int64_t raw_body_bytes,
                                    bool data_reduction_proxy_used,
                                    int64_t original_network_content_length)
-    : was_cached(was_cached),
+    : url(url),

[Charlie Harrison, 2017/04/10 18:39:42]

I really dislike doing an extra URL copy here... Are GURLs still not
move()-able?

[jkarlin, 2017/04/11 16:46:28]

Done.

[jkarlin, 2017/04/13 17:25:30]

Undone. It added too much complexity. For one thing the caller was taking a
const GURL& and std::moving it (a mistake on my part), which results in a copy
and no compiler warning.

Next, the top of the call stack, NotifyUIThreadOfRequestComplete, takes the url
as a const GURL& from Bind. std::moving that GURL results in a copy anyway. So
we don't actually reduce the number of copies and then everyone has to be more
careful about using the object after it has been std::moved.

+      frame_tree_node_id(frame_tree_node_id),
+      was_cached(was_cached),
       raw_body_bytes(raw_body_bytes),
       data_reduction_proxy_used(data_reduction_proxy_used),
       original_network_content_length(original_network_content_length) {}
 
 ExtraRequestInfo::ExtraRequestInfo(const ExtraRequestInfo& other) = default;
 
 ExtraRequestInfo::~ExtraRequestInfo() {}
 
 FailedProvisionalLoadInfo::FailedProvisionalLoadInfo(base::TimeDelta interval,
                                                      net::Error error)
@@ skipping 11 matching lines @@
 PageLoadMetricsObserver::ObservePolicy PageLoadMetricsObserver::OnRedirect(
     content::NavigationHandle* navigation_handle) {
   return CONTINUE_OBSERVING;
 }
 
 PageLoadMetricsObserver::ObservePolicy PageLoadMetricsObserver::OnCommit(
     content::NavigationHandle* navigation_handle) {
   return CONTINUE_OBSERVING;
 }
 
+PageLoadMetricsObserver::ObservePolicy
+PageLoadMetricsObserver::OnCommitSubFrame(
+    content::NavigationHandle* navigation_handle) {
+  return CONTINUE_OBSERVING;
+}
+
 PageLoadMetricsObserver::ObservePolicy PageLoadMetricsObserver::OnHidden(
     const PageLoadTiming& timing,
     const PageLoadExtraInfo& extra_info) {
   return CONTINUE_OBSERVING;
 }
 
 PageLoadMetricsObserver::ObservePolicy PageLoadMetricsObserver::OnShown() {
   return CONTINUE_OBSERVING;
 }
 
 PageLoadMetricsObserver::ObservePolicy
 PageLoadMetricsObserver::FlushMetricsOnAppEnterBackground(
     const PageLoadTiming& timing,
     const PageLoadExtraInfo& extra_info) {
   return CONTINUE_OBSERVING;
 }
 
 PageLoadMetricsObserver::ObservePolicy
 PageLoadMetricsObserver::ShouldObserveMimeType(
     const std::string& mime_type) const {
   return mime_type == "text/html" || mime_type == "application/xhtml+xml"
              ? CONTINUE_OBSERVING
              : STOP_OBSERVING;
 }
 
 }  // namespace page_load_metrics