Move console error detection in browser tests to higher level

chrome/test/base/javascript_browser_test.cc

 // Copyright 2014 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 "chrome/test/base/javascript_browser_test.h"
 
+#include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/resource/resource_bundle.h"
 
+namespace {
+
+bool g_has_console_errors = false;
+bool g_has_console_info = false;
+
+bool LogHandler(int severity,
+                const char* file,
+                int line,
+                size_t message_start,
+                const std::string& str) {
+  if (std::string("CONSOLE") == file) {
+    g_has_console_info = true;
+    if (severity == logging::LOG_ERROR)
+      g_has_console_errors = true;
+  }
+  return false;
+}
+
+}  // namespace
+
 // static
 const base::FilePath::CharType
     JavaScriptBrowserTest::kA11yAuditLibraryJSPath[] =
         FILE_PATH_LITERAL("third_party/accessibility-audit/axs_testing.js");
 
 // static
 const base::FilePath::CharType JavaScriptBrowserTest::kChaiJSPath[] =
     FILE_PATH_LITERAL("third_party/chaijs/chai.js");
 
 // static
@@ skipping 12 matching lines @@
   user_libraries_.push_back(library_path);
 }
 
 JavaScriptBrowserTest::JavaScriptBrowserTest() {
 }
 
 JavaScriptBrowserTest::~JavaScriptBrowserTest() {
 }
 
 void JavaScriptBrowserTest::SetUpOnMainThread() {
+  InProcessBrowserTest::SetUpOnMainThread();
+
+  logging::SetLogMessageHandler(&LogHandler);
+
   base::FilePath test_data_directory;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory));
   test_data_directory = test_data_directory.Append(kWebUITestFolder);
   library_search_paths_.push_back(test_data_directory);
 
   base::FilePath gen_test_data_directory;
   ASSERT_TRUE(
       PathService::Get(chrome::DIR_GEN_TEST_DATA, &gen_test_data_directory));
   library_search_paths_.push_back(gen_test_data_directory);
 
   base::FilePath source_root_directory;
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &source_root_directory));
   library_search_paths_.push_back(source_root_directory);
 
   AddLibrary(base::FilePath(kMockJSPath));
   AddLibrary(base::FilePath(kChaiJSPath));
   AddLibrary(base::FilePath(kWebUILibraryJS));
 }
 
+void JavaScriptBrowserTest::TearDownOnMainThread() {
+  logging::SetLogMessageHandler(nullptr);
+  InProcessBrowserTest::TearDownOnMainThread();
+}
+
 // TODO(dtseng): Make this return bool (success/failure) and remove ASSERt_TRUE
 // calls.
 void JavaScriptBrowserTest::BuildJavascriptLibraries(
     std::vector<base::string16>* libraries) {
   ASSERT_TRUE(libraries != NULL);
   std::vector<base::FilePath>::iterator user_libraries_iterator;
   for (user_libraries_iterator = user_libraries_.begin();
        user_libraries_iterator != user_libraries_.end();
        ++user_libraries_iterator) {
     std::string library_content;
@@ skipping 40 matching lines @@
   ConstValueVector::const_iterator arguments_iterator;
   for (arguments_iterator = test_func_args.begin();
        arguments_iterator != test_func_args.end();
        ++arguments_iterator) {
     baked_argument_list->Append((*arguments_iterator)->DeepCopy());
   }
   arguments.push_back(baked_argument_list);
   return content::WebUI::GetJavascriptCall(std::string("runTest"),
                                            arguments.get());
 }
+
+bool JavaScriptBrowserTest::has_console_errors() const {
+  return g_has_console_errors;
+}
+
+void JavaScriptBrowserTest::set_has_console_errors(bool has_console_errors) {
+  g_has_console_errors = has_console_errors;
+}
+
+bool JavaScriptBrowserTest::has_console_info() const {
+  return g_has_console_info;
+}
+
+void JavaScriptBrowserTest::set_has_console_info(bool has_console_info) {
+  g_has_console_info = has_console_info;
+}