WebContentsObserver update for PlzNavigate methods

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 "base/debug/dump_without_crashing.h"
 #include "base/logging.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
 #include "content/browser/appcache/appcache_service_impl.h"
@@ skipping 184 matching lines @@
   return sanitized_referrer_;
 }
 
 bool NavigationHandleImpl::HasUserGesture() {
   CHECK_NE(INITIAL, state_)
       << "This accessor should not be called before the request is started.";
   return has_user_gesture_;
 }
 
 ui::PageTransition NavigationHandleImpl::GetPageTransition() {
-  CHECK_NE(INITIAL, state_)
-      << "This accessor should not be called before the request is started.";
-  return transition_;
+  return state_ == INITIAL ? ui::PAGE_TRANSITION_TYPED : transition_;
 }
 
 bool NavigationHandleImpl::IsExternalProtocol() {
   CHECK_NE(INITIAL, state_)
       << "This accessor should not be called before the request is started.";
   return is_external_protocol_;
 }
 
 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 "
-         "delivered for processing.";
-  return render_frame_host_;
+  return state_ >= READY_TO_COMMIT ? render_frame_host_ : nullptr;
 }
 
 bool NavigationHandleImpl::IsSamePage() {
   return is_same_page_;
 }
 
 const net::HttpResponseHeaders* NavigationHandleImpl::GetResponseHeaders() {
   return response_headers_.get();
 }
 
@@ skipping 556 matching lines @@
     throttles_.push_back(std::move(ancestor_throttle));
 
   if (throttles_to_register.size() > 0) {
     throttles_.insert(throttles_.begin(), throttles_to_register.begin(),
                       throttles_to_register.end());
     throttles_to_register.weak_clear();
   }
 }
 
 }  // namespace content