Revert of Expose GlobalRequestID in NavigationHandle and ResourceRequestInfo.

content/browser/frame_host/navigation_handle_impl.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #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"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_data.h"
@@ skipping 99 matching lines @@
   NavigationThrottle::ThrottleCheckResult CallWillRedirectRequestForTesting(
       const GURL& new_url,
       bool new_method_is_post,
       const GURL& new_referrer_url,
       bool new_is_external_protocol) override;
   NavigationThrottle::ThrottleCheckResult CallWillProcessResponseForTesting(
       RenderFrameHost* render_frame_host,
       const std::string& raw_response_header) override;
   void CallDidCommitNavigationForTesting(const GURL& url) override;
   bool WasStartedFromContextMenu() const override;
-  const GlobalRequestID& GetGlobalRequestID() override;
 
   NavigationData* GetNavigationData() 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
   // be the InterstitialPage itself.
   //
   // Note: due to the interstitial navigation case, all calls that can possibly
   // expose the NavigationHandle to code outside of content/ MUST go though the
@@ skipping 117 matching lines @@
 
   // Called during commit. Takes ownership of the embedder's NavigationData
   // instance. This NavigationData may have been cloned prior to being added
   // here.
   void set_navigation_data(std::unique_ptr<NavigationData> navigation_data) {
     navigation_data_ = std::move(navigation_data);
   }
 
   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();
 
   NavigationUIData* navigation_ui_data() const {
     return navigation_ui_data_.get();
   }
 
  private:
   friend class NavigationHandleImplTest;
 
@@ skipping 138 matching lines @@
   bool started_from_context_menu_;
 
   base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_