First pass at refactoring pyautolib in preparation for removing proxy dependencies.

chrome/test/pyautolib/pyautolib.cc

 // Copyright (c) 2012 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 "base/base_paths.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/pyautolib/pyautolib.h"
 #include "googleurl/src/gurl.h"
 
 static int64 StringToId(const std::wstring& str) {
   int64 id;
   base::StringToInt64(WideToUTF8(str), &id);
   return id;
@@ skipping 334 matching lines @@
 
 
 scoped_refptr<BrowserProxy> PyUITestBase::GetBrowserWindow(int window_index) {
   return automation()->GetBrowserWindow(window_index);
 }
 
 std::string PyUITestBase::_SendJSONRequest(int window_index,
                                            const std::string& request,
                                            int timeout) {
   std::string response;
-  base::TimeTicks time;
-  if (window_index < 0) {  // Do not need to target a browser window.
-    time = base::TimeTicks::Now();
-    if (!automation()->SendJSONRequest(request, timeout, &response)) {
-        LOG(WARNING) << "SendJSONRequest returned false after "
-                     << (base::TimeTicks::Now() - time).InSeconds()
-                     << " seconds: " << request;
-    }
-  } else {
-    scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-    if (!browser_proxy.get()) {
-      base::DictionaryValue error_dict;
-      std::string error_string = StringPrintf(
-          "No browser at windex=%d for %s", window_index, request.c_str());
-      LOG(WARNING) << error_string;
-      error_dict.SetString("error", error_string);
-      base::JSONWriter::Write(&error_dict, &response);
-    } else {
-      time = base::TimeTicks::Now();
-      if (!browser_proxy->SendJSONRequest(request, timeout, &response)) {
-        LOG(WARNING) << "SendJSONRequest returned false after "
-                     << (base::TimeTicks::Now() - time).InSeconds()
-                     << " seconds: " << request;
-      }
-    }
+  bool success;
+  AutomationMessageSender* automation_sender = automation();
+  base::TimeTicks time = base::TimeTicks::Now();
+
+  if (!automation_sender) {
+    ErrorResponse("The automation proxy does not exist", request, &response);
+  } else if (!automation_sender->Send(
+      new AutomationMsg_SendJSONRequestWithBrowserIndex(window_index, request,
+                                                        &response, &success),
+      timeout)) {
+    RequestFailureResponse(request, base::TimeTicks::Now() - time,
+                           base::TimeDelta::FromMilliseconds(timeout),
+                           &response);
   }
   return response;
 }
 
+void PyUITestBase::ErrorResponse(
+    const std::string& error_string,
+    const std::string& request,
+    std::string* response) {
+  base::DictionaryValue error_dict;
+  LOG(WARNING) << "Error during automation: " << response;

[Nirnimesh, 2012/06/15 19:52:49]

LOG(ERROR)?

[craigdh, 2012/06/19 00:19:35]

Done.

+  error_dict.SetString("error",
+                       StringPrintf("%s for %s",
+                                    error_string.c_str(),
+                                    request.c_str()));
+  base::JSONWriter::Write(&error_dict, response);
+}
+
+void PyUITestBase::RequestFailureResponse(
+    const std::string& request,
+    const base::TimeDelta& duration,
+    const base::TimeDelta& timeout,
+    std::string* response) {
+  if (duration >= timeout) {

[Nirnimesh, 2012/06/15 19:52:49]

Add a TODO to deduce timeout from the ipc Send() call

[craigdh, 2012/06/19 00:19:35]

Done.

+    ErrorResponse(
+        StringPrintf("Request timed out after %d seconds",
+                     static_cast<int>(duration.InSeconds())),
+        request, response);
+  } else {
+    // TODO(craigdh): Determine specific cause.
+    ErrorResponse("Chrome failed to respond", request, response);
+  }
+}
+
 bool PyUITestBase::ResetToDefaultTheme() {
   return automation()->ResetToDefaultTheme();
 }
 
 bool PyUITestBase::SetCookie(const GURL& cookie_url,
                              const std::string& value,
                              int window_index,
                              int tab_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   EXPECT_TRUE(browser_proxy.get());
@@ skipping 15 matching lines @@
   // TODO(phadjan.jr): figure out a way to unambiguously report error.
   if (!browser_proxy.get())
     return cookie_val;
   scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index);
   EXPECT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
     return cookie_val;
   EXPECT_TRUE(tab_proxy->GetCookies(cookie_url, &cookie_val));
   return cookie_val;
 }