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 2d1f0098ca30ade1d0f16d0de747c202f5cf1abd..e98395e76357ced1791a8d03152ed83255225d5b 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"
@@ -131,6 +135,12 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
 
   NavigationData* GetNavigationData() override;
 
+  // This is valid after the network response has started.

[clamy, 2016/11/09 16:06:53]

Move this function to the block of implentation of NavigationHandle above and
remove the comment.

[Not at Google. Contact bengr, 2016/11/09 22:30:01]

Done.

+  // 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& GetGlobalRequestID() override;
+
   // The NavigatorDelegate to notify/query for various navigation events.
   // Normally this is the WebContents, except if this NavigationHandle was
   // created during a navigation to an interstitial page. In this case it will
@@ -265,15 +275,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();