- Add ChromeOS login and lock screen automation hooks.

- Add AutomationProxy::SendJSONRequest that does not require a handle to a Browser/BrowserProxy.
- Fix issue where AutomationProvider thinks it's never finished loading the login screen.
- Not included: UI tests for login, since they should be PyAuto tests.
- Not included: fix for Chrome quitting as a result of channel disconnect.

BUG=chromium-os:11538
TEST=none

Review URL: http://codereview.chromium.org/6320022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73327 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 1 deletions

diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 461b3e4..6aa64b3 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -551,3 +551,12 @@ bool AutomationProxy::LoginWithUserAndPass(const std::string& username,
 bool AutomationProxy::ResetToDefaultTheme() {
   return Send(new AutomationMsg_ResetToDefaultTheme());
 }
+
+bool AutomationProxy::SendJSONRequest(const std::string& request,
+                                      std::string* response) {
+  bool result = false;
+  return Send(new AutomationMsg_SendJSONRequest(
+      -1, request, response, &result));
+  return result;
+}
+
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index cfc8c8b..9770f3c 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -213,6 +213,10 @@ class AutomationProxy : public IPC::Channel::Listener,
   // Resets to the default theme. Returns true on success.
   bool ResetToDefaultTheme();
 
+  // Generic pattern for sending automation requests.
+  bool SendJSONRequest(const std::string& request,
+                       std::string* response) WARN_UNUSED_RESULT;
+
 #if defined(OS_CHROMEOS)
   // Logs in through the Chrome OS login wizard with given |username|
   // and |password|.  Returns true on success.
diff --git a/chrome/test/automation/browser_proxy.h b/chrome/test/automation/browser_proxy.h
index 6d0d215..7d77949 100644
--- a/chrome/test/automation/browser_proxy.h
+++ b/chrome/test/automation/browser_proxy.h
@@ -221,7 +221,7 @@ class BrowserProxy : public AutomationResourceProxy {
   bool StartTrackingPopupMenus() WARN_UNUSED_RESULT;
   bool WaitForPopupMenuToOpen() WARN_UNUSED_RESULT;
 
-  // Experimental generic pattern.
+  // Generic pattern for sending automation requests.
   bool SendJSONRequest(const std::string& request,
                        std::string* response) WARN_UNUSED_RESULT;