summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation/javascript_execution_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/automation/javascript_execution_controller.cc')
-rw-r--r--chrome/test/automation/javascript_execution_controller.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/test/automation/javascript_execution_controller.cc b/chrome/test/automation/javascript_execution_controller.cc
index f743c9e..0c266eb 100644
--- a/chrome/test/automation/javascript_execution_controller.cc
+++ b/chrome/test/automation/javascript_execution_controller.cc
@@ -44,7 +44,7 @@ std::string JavaScriptExecutionController::WrapAsyncJavaScript(
const std::string& original_script) {
if (timeout_ms_ == -1) {
NOTREACHED() << "Timeout for asynchronous JavaScript methods has not been "
- << "set. Please use JavaScriptExecutionController::"
+ << "set. Call JavaScriptExecutionController::"
<< "set_timeout(timeout_in_ms).";
}
const char* script =
@@ -74,10 +74,11 @@ bool JavaScriptExecutionController::ExecuteAndParseHelper(
// - result (string): the result of the evaluation (in JSON), or the
// exact error if an error occurred (in JSON)
if (!root_value.get()) {
- if (parsing_error.length())
+ if (parsing_error.length()) {
LOG(ERROR) << "Cannot parse JSON response: " << parsing_error;
- else
+ } else {
LOG(ERROR) << "JSON response is empty";
+ }
return false;
}