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 226 matching lines @@
 
 void NavigationHandleImpl::CancelDeferredNavigation(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK(state_ == DEFERRING_START || state_ == DEFERRING_REDIRECT);
   DCHECK(result == NavigationThrottle::CANCEL_AND_IGNORE ||
          result == NavigationThrottle::CANCEL);
   state_ = CANCELING;
   RunCompleteCallback(result);
 }
 
+void NavigationHandleImpl::QueueConsoleMessage(ConsoleMessageLevel level,
+                                               const std::string& message) {
+  console_queue_.emplace(level, message);
+
+  if (state_ >= WILL_PROCESS_RESPONSE)
+    DumpMessagesToConsole();
+}
+
 void NavigationHandleImpl::RegisterThrottleForTesting(
     std::unique_ptr<NavigationThrottle> navigation_throttle) {
   throttles_.push_back(std::move(navigation_throttle));
 }
 
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CallWillStartRequestForTesting(
     bool is_post,
     const Referrer& sanitized_referrer,
     bool has_user_gesture,
@@ skipping 126 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();

[clamy, 2016/06/28 11:30:38]

This is problematic right now for transfer navigations. I'm not thrilled about
landing this until we get ReadyToCommitNavigation to execute on all sorts of
navigations.

[Mike West, 2016/06/28 12:22:33]

It's no more problematic than getting the RenderFrameHost in the first place, is
it?

We could move it to 'ReadyToCommitNavigation' now, and just recognize that we'll
lose some console messages in the meantime. Though, now that I think about it,
that seems incorrect for cases in which the throttle will actually cancel the
navigation. In those cases, we'll never actually hit ReadyToCommitNavigation
(see line 412 below)... Hrm.

+
   // 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 131 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