Revert 88492 - In chromedriver, add /log url to get the contents of the chromedriver log

chrome/test/automation/automation_json_requests.cc

 // Copyright (c) 2011 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/automation/automation_json_requests.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "content/common/json_value_serializer.h"
 
 namespace {
 
 bool SendAutomationJSONRequest(AutomationMessageSender* sender,
                                const DictionaryValue& request_dict,
                                DictionaryValue* reply_dict,
                                std::string* error_msg) {
   std::string request, reply;
   base::JSONWriter::Write(&request_dict, false, &request);
-  std::string command;
-  request_dict.GetString("command", &command);
-  LOG(INFO) << "Sending '" << command << "' command.";
-
+  bool success = false;
+  int timeout_ms = TestTimeouts::action_max_timeout_ms();
   base::Time before_sending = base::Time::Now();
-  bool success = false;
-  if (!SendAutomationJSONRequestWithDefaultTimeout(
-          sender, request, &reply, &success)) {
-    *error_msg = base::StringPrintf(
-        "Chrome did not respond to '%s'. Elapsed time was %" PRId64 " ms. "
-            "Request details: (%s).",
-        command.c_str(),
-        (base::Time::Now() - before_sending).InMilliseconds(),
-        request.c_str());
+  if (!SendAutomationJSONRequest(
+          sender, request, timeout_ms, &reply, &success)) {
+    int64 elapsed_ms = (base::Time::Now() - before_sending).InMilliseconds();
+    std::string command;
+    request_dict.GetString("command", &command);
+    if (elapsed_ms >= timeout_ms) {
+      *error_msg = base::StringPrintf(
+          "Chrome did not respond to '%s'. Request may have timed out. "
+              "Elapsed time was %" PRId64 " ms. Request timeout was %d ms. "
+              "Request details: (%s).",
+          command.c_str(),
+          elapsed_ms,
+          timeout_ms,
+          request.c_str());
+    } else {
+      *error_msg = base::StringPrintf(
+          "Chrome did not respond to '%s'. Elapsed time was %" PRId64 " ms. "
+              "Request details: (%s).",
+          command.c_str(),
+          elapsed_ms,
+          request.c_str());
+    }
     return false;
   }
   scoped_ptr<Value> value(base::JSONReader::Read(reply, true));
   if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) {
+    std::string command;
+    request_dict.GetString("command", &command);
     LOG(ERROR) << "JSON request did not return dict: " << command << "\n";
     return false;
   }
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!success) {
-    std::string error;
+    std::string command, error;
+    request_dict.GetString("command", &command);
     dict->GetString("error", &error);
     *error_msg = base::StringPrintf(
         "Internal Chrome error during '%s': (%s). Request details: (%s).",
         command.c_str(),
         error.c_str(),
         request.c_str());
     LOG(ERROR) << "JSON request failed: " << command << "\n"
                << "    with error: " << error;
     return false;
   }
@@ skipping 16 matching lines @@
 
 bool SendAutomationJSONRequest(AutomationMessageSender* sender,
                                const std::string& request,
                                int timeout_ms,
                                std::string* reply,
                                bool* success) {
   return sender->Send(new AutomationMsg_SendJSONRequest(
       -1, request, reply, success), timeout_ms);
 }
 
-bool SendAutomationJSONRequestWithDefaultTimeout(
-    AutomationMessageSender* sender,
-    const std::string& request,
-    std::string* reply,
-    bool* success) {
-  return sender->Send(new AutomationMsg_SendJSONRequest(
-      -1, request, reply, success));
-}
-
 bool SendGetIndicesFromTabIdJSONRequest(
     AutomationMessageSender* sender,
     int tab_id,
     int* browser_index,
     int* tab_index,
     std::string* error_msg) {
   DictionaryValue request_dict;
   request_dict.SetString("command", "GetIndicesFromTab");
   request_dict.SetInteger("tab_id", tab_id);
   DictionaryValue reply_dict;
@@ skipping 515 matching lines @@
     AutomationMessageSender* sender,
     int* version,
     std::string* error_msg) {
   DictionaryValue dict;
   dict.SetString("command", "GetChromeDriverAutomationVersion");
   DictionaryValue reply_dict;
   if (!SendAutomationJSONRequest(sender, dict, &reply_dict, error_msg))
     return false;
   return reply_dict.GetInteger("version", version);
 }