Use named automation interface to control primary chrome on ChromeOS

chrome/test/pyautolib/pyautolib.cc

 // Copyright (c) 2010 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/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/automation/extension_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 47 matching lines @@
   MessageLoop::Type msg_loop_type) {
   if (!message_loop_)   // Create a shared instance of MessageLoop
     message_loop_ = new MessageLoop(msg_loop_type);
   return message_loop_;
 }
 
 void PyUITestBase::Initialize(const FilePath& browser_dir) {
   UITestBase::SetBrowserDirectory(browser_dir);
 }
 
+ProxyLauncher* PyUITestBase::CreateProxyLauncher() {
+  if (named_channel_id_.empty())
+    return new AnonymousProxyLauncher(false);
+  return new NamedProxyLauncher(named_channel_id_, false, false);
+}
+
 void PyUITestBase::SetUp() {
   UITestBase::SetUp();
 }
 
 void PyUITestBase::TearDown() {
   UITestBase::TearDown();
 }
 
 void PyUITestBase::NavigateToURL(const char* url_string) {
   GURL url(url_string);
@@ skipping 228 matching lines @@
     return false;
 
   return browser_proxy->RemoveBookmark(StringToId(id));
 }
 
 scoped_refptr<BrowserProxy> PyUITestBase::GetBrowserWindow(int window_index) {
   return automation()->GetBrowserWindow(window_index);
 }
 
 std::string PyUITestBase::_SendJSONRequest(int window_index,
-                                           std::string& request) {
-  scoped_refptr<BrowserProxy> browser_proxy =
-      automation()->GetBrowserWindow(window_index);
-  EXPECT_TRUE(browser_proxy.get());
+                                           const std::string& request) {
   std::string response;
-  if (browser_proxy.get()) {
-    EXPECT_TRUE(browser_proxy->SendJSONRequest(request, &response));
+  if (window_index < 0) {  // Do not need to target a browser window.
+    EXPECT_TRUE(automation()->SendJSONRequest(request, &response));
+  } else {
+    scoped_refptr<BrowserProxy> browser_proxy =
+        automation()->GetBrowserWindow(window_index);
+    EXPECT_TRUE(browser_proxy.get());
+    if (browser_proxy.get()) {
+      EXPECT_TRUE(browser_proxy->SendJSONRequest(request, &response));
+    }
   }
   return response;
 }
 
 std::wstring PyUITestBase::ExecuteJavascript(const std::wstring& script,
                                              int window_index,
                                              int tab_index,
                                              const std::wstring& frame_xpath) {
   scoped_refptr<BrowserProxy> browser_proxy =
       automation()->GetBrowserWindow(window_index);
@@ skipping 49 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;
 }