Expose GlobalRequestID in NavigationHandle and ResourceRequestInfo.

content/browser/frame_host/navigation_handle_impl.cc

 // 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.
 
 #include "content/browser/frame_host/navigation_handle_impl.h"
 
-#include <utility>
-
 #include "base/debug/dump_without_crashing.h"
 #include "base/logging.h"
 #include "content/browser/browsing_data/clear_site_data_throttle.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_navigation_handle.h"
@@ skipping 177 matching lines @@
       << "This accessor should not be called before the request is started.";
   return transition_;
 }
 
 bool NavigationHandleImpl::IsExternalProtocol() {
   CHECK_NE(INITIAL, state_)
       << "This accessor should not be called before the request is started.";
   return is_external_protocol_;
 }
 
+bool NavigationHandleImpl::HasNetworkResponseStarted() {
+  return state_ >= WILL_PROCESS_RESPONSE;
+}
+
 net::Error NavigationHandleImpl::GetNetErrorCode() {
   return net_error_code_;
 }
 
 RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
   // TODO(mkwst): Change this to check against 'READY_TO_COMMIT' once
   // ReadyToCommitNavigation is available whether or not PlzNavigate is
   // enabled. https://crbug.com/621856
   CHECK_GE(state_, WILL_PROCESS_RESPONSE)
       << "This accessor should only be called after a response has been "
@@ skipping 140 matching lines @@
   params.page_state = PageState::CreateFromURL(url);
   params.contents_mime_type = std::string("text/html");
 
   DidCommitNavigation(params, false, render_frame_host_);
 }
 
 NavigationData* NavigationHandleImpl::GetNavigationData() {
   return navigation_data_.get();
 }
 
+const GlobalRequestID& NavigationHandleImpl::GetGlobalRequestID() {
+  DCHECK_GE(state_, WILL_PROCESS_RESPONSE);

[clamy, 2016/11/04 14:44:17]

This should be changed to
DCHECK(state_ == WILL_PROCESS_RESPONSE ||
state_ == DEFERRING_RESPONSE ||
state_ == READY_TO_COMMIT);

See my comment in NavigationHandle for the rationale.

[Not at Google. Contact bengr, 2016/11/07 22:17:18]

Done.

+  return request_id_;
+}
+
 void NavigationHandleImpl::InitServiceWorkerHandle(
     ServiceWorkerContextWrapper* service_worker_context) {
   DCHECK(IsBrowserSideNavigationEnabled());
   service_worker_handle_.reset(
       new ServiceWorkerNavigationHandle(service_worker_context));
 }
 
 void NavigationHandleImpl::WillStartRequest(
     const std::string& method,
     scoped_refptr<content::ResourceRequestBodyImpl> resource_request_body,
@@ skipping 367 matching lines @@
                       throttles_to_register.end());
     throttles_to_register.weak_clear();
   }
 }
 
 bool NavigationHandleImpl::WasStartedFromContextMenu() const {
   return started_from_context_menu_;
 }
 
 }  // namespace content