Revert "[PageLoadMetrics] Keep track of Ad Sizes on Pages"

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 <memory>
 #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 "content/public/common/resource_type.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.
 enum PageEndReason {
   // Page lifetime has not yet ended (page is still active).
@@ skipping 167 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 completed request within a page
 // load.
 struct ExtraRequestCompleteInfo {
   ExtraRequestCompleteInfo(
-      const GURL& url,
-      int frame_tree_node_id,
       bool was_cached,
       int64_t raw_body_bytes,
       int64_t original_network_content_length,
       std::unique_ptr<data_reduction_proxy::DataReductionProxyData>
           data_reduction_proxy_data,
       content::ResourceType detected_resource_type);
 
   ~ExtraRequestCompleteInfo();
 
-  // The URL for the request.
-  const GURL url;
-
-  // The frame tree node id that initiated the request.
-  const int frame_tree_node_id;
-
   // 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;
 
   // 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;
 
@@ skipping 57 matching lines @@
       content::NavigationHandle* navigation_handle);
 
   // OnCommit is triggered when a page load commits, i.e. when we receive the
   // first data for the request. The navigation handle holds relevant data for
   // the navigation, but will be destroyed soon after this call. Don't hold a
   // reference to it.
   // Observers that return STOP_OBSERVING will not receive any additional
   // callbacks, and will be deleted after invocation of this method returns.
   virtual ObservePolicy OnCommit(content::NavigationHandle* navigation_handle);
 
-  // OnDidFinishSubFrameNavigation is triggered when a sub-frame of the
-  // committed page has finished navigating. It has either committed, aborted,
-  // was a same document navigation, or has been replaced. It is up to the
-  // observer to query |navigation_handle| to determine which happened. Note
-  // that |navigation_handle| will be destroyed soon after this call. Don't
-  // hold a reference to it.
-  virtual ObservePolicy OnDidFinishSubFrameNavigation(
-      content::NavigationHandle* navigation_handle);
-
   // OnHidden is triggered when a page leaves the foreground. It does not fire
   // when a foreground page is permanently closed; for that, listen to
   // OnComplete instead.
   virtual ObservePolicy OnHidden(const PageLoadTiming& timing,
                                  const PageLoadExtraInfo& extra_info);
 
   // OnShown is triggered when a page is brought to the foreground. It does not
   // fire when the page first loads; for that, listen for OnStart instead.
   virtual ObservePolicy OnShown();
 
@@ skipping 98 matching lines @@
   // OnFailedProvisionalLoad is invoked for tracked page loads that did not
   // commit, immediately before the observer is deleted.
   virtual void OnFailedProvisionalLoad(
       const FailedProvisionalLoadInfo& failed_provisional_load_info,
       const PageLoadExtraInfo& extra_info) {}
 
   // Called whenever a request load begins.
   virtual void OnStartedResource(
       const ExtraRequestStartInfo& extra_request_start_info) {}
 
-  // Called whenever a request is loaded for this page load. This comes
-  // unfiltered from the ResourceDispatcherHost and may include blob requests
-  // and data uris.
+  // Called whenever a request is loaded for this page load.
   virtual void OnLoadedResource(
       const ExtraRequestCompleteInfo& extra_request_complete_info) {}
 };
 
 }  // namespace page_load_metrics
 
 #endif  // CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_METRICS_OBSERVER_H_