NavigationSimulator: add support for GlobalRequestIds

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 504 matching lines @@
     DCHECK_NE(started_in_foreground_, background_time_.is_null());
     foreground_time_ = base::TimeTicks::Now();
     ClampBrowserTimestampIfInterProcessTimeTickSkew(&foreground_time_);
   }
 
   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())
-    return;
-
+  DCHECK(navigation_handle->GetGlobalRequestID() != content::GlobalRequestID());

[Charlie Reis, 2017/05/15 20:07:43]

This looks possibly redundant with line 528 now that the conditional is gone.

[Charlie Harrison, 2017/05/15 21:45:54]

Done.

   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();
@@ skipping 392 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