summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 00:59:50 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 00:59:50 +0000
commite6ef139d4e7306d4b565652f67661dcad8cb9073 (patch)
tree039dc294cb9bb469b08d7146af6f2d22239f8a99 /content
parentfbdfe7274b8b88fbd82f96ff43162f6acc463e9d (diff)
downloadchromium_src-e6ef139d4e7306d4b565652f67661dcad8cb9073.zip
chromium_src-e6ef139d4e7306d4b565652f67661dcad8cb9073.tar.gz
chromium_src-e6ef139d4e7306d4b565652f67661dcad8cb9073.tar.bz2
Revert 82950 - Add a test for checking that refreshing a page does load the same WebUI page.BUG=57485TEST=this one.Review URL: http://codereview.chromium.org/6805003
TBR=dtseng@chromium.org Review URL: http://codereview.chromium.org/6902019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/webui/web_ui_browsertest.cc10
-rw-r--r--content/browser/webui/web_ui_test_handler.cc2
2 files changed, 4 insertions, 8 deletions
diff --git a/content/browser/webui/web_ui_browsertest.cc b/content/browser/webui/web_ui_browsertest.cc
index 59484e7..be72c48 100644
--- a/content/browser/webui/web_ui_browsertest.cc
+++ b/content/browser/webui/web_ui_browsertest.cc
@@ -26,19 +26,15 @@ bool LogHandler(int severity,
int line,
size_t message_start,
const std::string& str) {
- if (severity == logging::LOG_ERROR) {
+ if (severity == logging::LOG_ERROR)
error_messages_.push_back(str);
- return true;
- } else {
- // For debugging messages while developing tests.
- return false;
- }
+ return true;
}
WebUIBrowserTest::~WebUIBrowserTest() {}
bool WebUIBrowserTest::RunJavascriptFunction(const std::string& function_name) {
- return RunJavascriptUsingHandler(function_name, true);
+ return RunJavascriptUsingHandler(function_name, false);
}
bool WebUIBrowserTest::RunJavascriptTest(const std::string& test_name) {
diff --git a/content/browser/webui/web_ui_test_handler.cc b/content/browser/webui/web_ui_test_handler.cc
index 280774f..22c3442 100644
--- a/content/browser/webui/web_ui_test_handler.cc
+++ b/content/browser/webui/web_ui_test_handler.cc
@@ -33,7 +33,7 @@ void WebUITestHandler::HandleFail(const ListValue* args) {
std::string message;
ASSERT_TRUE(args->GetString(0, &message));
- LOG(ERROR) << message;
+ LOG(INFO) << message;
}
void WebUITestHandler::RegisterMessages() {