Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Unified Diff: chrome/test/base/web_ui_browser_test.cc

Issue 2045843002: Move console error detection in browser tests to higher level (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ftp-error
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/javascript_browser_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/web_ui_browser_test.cc
diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc
index 4a55e86fc2e041d9b37aca86663e4c6dc6f2a426..a7deaad5a51dbc5e9c310b889202866628765028 100644
--- a/chrome/test/base/web_ui_browser_test.cc
+++ b/chrome/test/base/web_ui_browser_test.cc
@@ -47,25 +47,6 @@ using content::WebContents;
using content::WebUIController;
using content::WebUIMessageHandler;
-namespace {
-
-base::LazyInstance<std::vector<std::string> > error_messages_ =
- LAZY_INSTANCE_INITIALIZER;
-
-// Intercepts all log messages.
-bool LogHandler(int severity,
- const char* file,
- int line,
- size_t message_start,
- const std::string& str) {
- if (severity == logging::LOG_ERROR && file &&
- std::string("CONSOLE") == file) {
- error_messages_.Get().push_back(str);
- }
-
- return false;
-}
-
class WebUIJsInjectionReadyObserver : public content::WebContentsObserver {
public:
WebUIJsInjectionReadyObserver(content::WebContents* web_contents,
@@ -88,8 +69,6 @@ class WebUIJsInjectionReadyObserver : public content::WebContentsObserver {
std::string preload_test_name_;
};
-} // namespace
-
WebUIBrowserTest::~WebUIBrowserTest() {
}
@@ -372,8 +351,6 @@ base::LazyInstance<MockWebUIProvider> mock_provider_ =
void WebUIBrowserTest::SetUpOnMainThread() {
JavaScriptBrowserTest::SetUpOnMainThread();
- logging::SetLogMessageHandler(&LogHandler);
-
AddLibrary(base::FilePath(kA11yAuditLibraryJSPath));
content::WebUIControllerFactory::UnregisterFactoryForTesting(
@@ -390,8 +367,6 @@ void WebUIBrowserTest::SetUpOnMainThread() {
}
void WebUIBrowserTest::TearDownOnMainThread() {
- logging::SetLogMessageHandler(NULL);
-
test_factory_->RemoveFactoryOverride(GURL(kDummyURL).host());
content::WebUIControllerFactory::UnregisterFactoryForTesting(
test_factory_.get());
@@ -402,6 +377,8 @@ void WebUIBrowserTest::TearDownOnMainThread() {
ChromeWebUIControllerFactory::GetInstance());
test_factory_.reset();
+
+ JavaScriptBrowserTest::TearDownOnMainThread();
}
void WebUIBrowserTest::SetWebUIInstance(content::WebUI* web_ui) {
@@ -458,11 +435,12 @@ bool WebUIBrowserTest::RunJavascriptUsingHandler(
else
test_handler_->RunJavaScript(content);
- if (error_messages_.Get().size() > 0) {
+ if (has_console_errors()) {
LOG(ERROR) << "Encountered javascript console error(s)";
result = false;
- error_messages_.Get().clear();
+ set_has_console_errors(false);
}
+
return result;
}
« no previous file with comments | « chrome/test/base/javascript_browser_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698