Add 'NavigationHandle::QueueConsoleMessage'.

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/logging.h"
 #include "content/browser/frame_host/frame_tree_node.h"
@@ skipping 372 matching lines @@
 void NavigationHandleImpl::WillProcessResponse(
     RenderFrameHostImpl* render_frame_host,
     scoped_refptr<net::HttpResponseHeaders> response_headers,
     const ThrottleChecksFinishedCallback& callback) {
   DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
   render_frame_host_ = render_frame_host;
   response_headers_ = response_headers;
   state_ = WILL_PROCESS_RESPONSE;
   complete_callback_ = callback;
 
+  // Clear out the pending console message queue now that we have a
+  // render_frame_host.
+  //
+  // TODO(mkwst): Move this to 'ReadyToCommitNavigation' as part of the work
+  // in https://crbug.com/621856.
+  DumpMessagesToConsole();
+
   // Notify each throttle of the response.
   NavigationThrottle::ThrottleCheckResult result = CheckWillProcessResponse();
 
   // If the navigation is about to proceed, then it's ready to commit.
   if (result == NavigationThrottle::PROCEED)
     ReadyToCommitNavigation(render_frame_host);
 
   // If the navigation is not deferred, run the callback.
   if (result != NavigationThrottle::DEFER)
     RunCompleteCallback(result);
@@ skipping 21 matching lines @@
 
   method_ = params.method;
   has_user_gesture_ = (params.gesture == NavigationGestureUser);
   transition_ = params.transition;
   render_frame_host_ = render_frame_host;
   is_same_page_ = same_page;
 
   state_ = net_error_code_ == net::OK ? DID_COMMIT : DID_COMMIT_ERROR_PAGE;
 }
 
+void NavigationHandleImpl::QueueConsoleMessage(ConsoleMessageLevel level,
+                                               const std::string& message) {
+  console_queue_.emplace(level, message);
+
+  if (state_ >= WILL_PROCESS_RESPONSE)
+    DumpMessagesToConsole();
+}
+
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CheckWillStartRequest() {
   DCHECK(state_ == WILL_SEND_REQUEST || state_ == DEFERRING_START);
   DCHECK(state_ != WILL_SEND_REQUEST || next_index_ == 0);
   DCHECK(state_ != DEFERRING_START || next_index_ != 0);
   for (size_t i = next_index_; i < throttles_.size(); ++i) {
     NavigationThrottle::ThrottleCheckResult result =
         throttles_[i]->WillStartRequest();
     switch (result) {
       case NavigationThrottle::PROCEED:
@@ skipping 90 matching lines @@
   ThrottleChecksFinishedCallback callback = complete_callback_;
   complete_callback_.Reset();
 
   if (!callback.is_null())
     callback.Run(result);
 
   // No code after running the callback, as it might have resulted in our
   // destruction.
 }
 
+void NavigationHandleImpl::DumpMessagesToConsole() {
+  DCHECK_GE(state_, WILL_PROCESS_RESPONSE);
+  DCHECK(GetRenderFrameHost());
+
+  while (!console_queue_.empty()) {
+    GetRenderFrameHost()->AddMessageToConsole(console_queue_.front().first,
+                                              console_queue_.front().second);
+    console_queue_.pop();
+  }
+}
+
 }  // namespace content