Hide console log messages for imported WPT tests

content/shell/test_runner/web_frame_test_client.cc

 // Copyright 2016 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/shell/test_runner/web_frame_test_client.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
@@ skipping 630 matching lines @@
       break;
     case blink::WebConsoleMessage::LevelWarning:
       level = "WARNING";
       break;
     case blink::WebConsoleMessage::LevelError:
       level = "ERROR";
       break;
     default:
       level = "MESSAGE";
   }
-  delegate_->PrintMessage(std::string("CONSOLE ") + level + ": ");
+  std::string consoleMessage(std::string("CONSOLE ") + level + ": ");
   if (source_line) {
-    delegate_->PrintMessage(base::StringPrintf("line %d: ", source_line));
+    consoleMessage += base::StringPrintf("line %d: ", source_line);
   }
+  bool dump_to_stderr = test_runner()->is_web_platform_tests_mode();

[Rick Byers, 2017/03/09 13:22:24]

nit: add a comment saying why, eg. "Console messages shouldn't be included in
the expected output for web-platform-tests because they may create
non-determinism not intended by the test author.  But still generate the output
on stderr for debugging purposes".

[Dan Elphick, 2017/03/09 13:41:40]

Done.

   if (!message.text.isEmpty()) {
     std::string new_message;
     new_message = message.text.utf8();
     size_t file_protocol = new_message.find("file://");
     if (file_protocol != std::string::npos) {
       new_message = new_message.substr(0, file_protocol) +
                     URLSuitableForTestResult(new_message.substr(file_protocol));
     }
-    delegate_->PrintMessage(new_message);
+    consoleMessage += new_message;
   }
-  delegate_->PrintMessage(std::string("\n"));
+  consoleMessage += "\n";
+
+  if (dump_to_stderr) {
+    delegate_->PrintLogMessage(consoleMessage);
+  } else {
+    delegate_->PrintMessage(consoleMessage);
+  }
 }
 
 blink::WebNavigationPolicy WebFrameTestClient::decidePolicyForNavigation(
     const blink::WebFrameClient::NavigationPolicyInfo& info) {
   // PlzNavigate
   // Navigation requests initiated by the renderer have checked navigation
   // policy when the navigation was sent to the browser. Some layout tests
   // expect that navigation policy is only checked once.
   if (delegate_->IsNavigationInitiatedByRenderer(info.urlRequest))
     return info.defaultPolicy;
@@ skipping 57 matching lines @@
 blink::WebEffectiveConnectionType
 WebFrameTestClient::getEffectiveConnectionType() {
   return test_runner()->effective_connection_type();
 }
 
 TestRunner* WebFrameTestClient::test_runner() {
   return web_view_test_proxy_base_->test_interfaces()->GetTestRunner();
 }
 
 }  // namespace test_runner