Revert of 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 bd6865d6d8ee9a132948173b520500ba8b198111..2d1f0098ca30ade1d0f16d0de747c202f5cf1abd 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -8,11 +8,7 @@
 #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"
@@ -132,7 +128,6 @@
       const std::string& raw_response_header) override;
   void CallDidCommitNavigationForTesting(const GURL& url) override;
   bool WasStartedFromContextMenu() const override;
-  const GlobalRequestID& GetGlobalRequestID() override;
 
   NavigationData* GetNavigationData() override;
 
@@ -270,6 +265,15 @@
 
   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();