Expose GlobalRequestID in NavigationHandle and ResourceRequestInfo.

content/browser/frame_host/navigation_handle_impl.h

Index: content/browser/frame_host/navigation_handle_impl.h
diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
index 3eeed430174884bb1da488b9bfb8d4be41348b96..c02844b80f469e4fffd04f4dabee9f9eb87d0584 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -8,7 +8,11 @@
 #include "content/public/browser/navigation_handle.h"
 
 #include <stddef.h>
+
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -130,6 +134,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
   bool WasStartedFromContextMenu() const override;
   const GURL& GetSearchableFormURL() override;
   const std::string& GetSearchableFormEncoding() override;
+  const GlobalRequestID& GetGlobalRequestID() override;
 
   NavigationData* GetNavigationData() override;
 
@@ -267,15 +272,6 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
 
   SSLStatus ssl_status() { return ssl_status_; }
 
-  // This is valid after the network response has started.
-  // TODO(clamy): See if this can be initialized earlier if needed by
-  // non-transfer code. There may be some issues in PlzNavigate, where
-  // WillStartRequest will be called before starting a request on the IO thread.
-  const GlobalRequestID& request_id() const {
-    DCHECK_GE(state_, WILL_PROCESS_RESPONSE);
-    return request_id_;
-  }
-
   // Called when the navigation is transferred to a different renderer.
   void Transfer();