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

chrome/browser/page_load_metrics/page_load_tracker.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/page_load_tracker.h"
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 #include <utility>
@@ skipping 463 matching lines @@
   }
 
   INVOKE_AND_PRUNE_OBSERVERS(observers_, OnShown);
 }
 
 void PageLoadTracker::WillProcessNavigationResponse(
     content::NavigationHandle* navigation_handle) {
   // PlzNavigate: NavigationHandle::GetGlobalRequestID() sometimes returns an
   // uninitialized GlobalRequestID. Bail early in this case. See
   // crbug.com/680841 for details.
-  // TODO(jkarlin): NavigationSimulator is the first unittest framework to hit
-  // this function, and it doesn't provide a GlobalRequestID. Add an ID. See
-  // crbug.com/711352 for details.
-  if (navigation_handle->GetGlobalRequestID() == content::GlobalRequestID())
+  if (content::IsBrowserSideNavigationEnabled() &&
+      navigation_handle->GetGlobalRequestID() == content::GlobalRequestID())
     return;
 
   DCHECK(!navigation_request_id_.has_value());
   navigation_request_id_ = navigation_handle->GetGlobalRequestID();
   DCHECK(navigation_request_id_.value() != content::GlobalRequestID());
 }
 
 void PageLoadTracker::Commit(content::NavigationHandle* navigation_handle) {
   did_commit_ = true;
   url_ = navigation_handle->GetURL();
   // Some transitions (like CLIENT_REDIRECT) are only known at commit time.
   page_transition_ = navigation_handle->GetPageTransition();
   user_initiated_info_.user_gesture = navigation_handle->HasUserGesture();
 
   INVOKE_AND_PRUNE_OBSERVERS(
       observers_, ShouldObserveMimeType,
       navigation_handle->GetWebContents()->GetContentsMimeType());
 
   INVOKE_AND_PRUNE_OBSERVERS(observers_, OnCommit, navigation_handle);
   LogAbortChainHistograms(navigation_handle);
 }
 
-void PageLoadTracker::DidFinishSubFrameNavigation(
-    content::NavigationHandle* navigation_handle) {
-  INVOKE_AND_PRUNE_OBSERVERS(observers_, OnDidFinishSubFrameNavigation,
-                             navigation_handle);
-}
-
 void PageLoadTracker::FailedProvisionalLoad(
     content::NavigationHandle* navigation_handle,
     base::TimeTicks failed_load_time) {
   DCHECK(!failed_provisional_load_info_);
   failed_provisional_load_info_.reset(new FailedProvisionalLoadInfo(
       failed_load_time - navigation_handle->NavigationStart(),
       navigation_handle->GetNetErrorCode()));
 }
 
 void PageLoadTracker::Redirect(content::NavigationHandle* navigation_handle) {
@@ skipping 286 matching lines @@
     observer->MediaStartedPlaying(video_type, is_in_main_frame);
 }
 
 void PageLoadTracker::OnNavigationDelayComplete(base::TimeDelta scheduled_delay,
                                                 base::TimeDelta actual_delay) {
   for (const auto& observer : observers_)
     observer->OnNavigationDelayComplete(scheduled_delay, actual_delay);
 }
 
 }  // namespace page_load_metrics