Fix search engine automation hooks to work with multiple profiles.

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 1184 matching lines @@
           u'loading': True,
           u'location': u'http://cnn.com/',
           u'showing': False,
           u'title': u'CNN.com - Breaking News'},
 
         { u'enabled': False }
     """
     cmd_dict = {'command': 'GetInstantInfo'}
     return self._GetResultFromJSONRequest(cmd_dict)['instant']
 
-  def GetSearchEngineInfo(self):
+  def GetSearchEngineInfo(self, windex=0):
     """Return info about search engines.
 
+    Args:
+      windex: The window index, default is 0.
+
     Returns:
       An ordered list of dictionaries describing info about each search engine.
 
       Example:
         [ { u'display_url': u'{google:baseURL}search?q=%s',
             u'host': u'www.google.com',
             u'in_default_list': True,
             u'is_default': True,
             u'is_valid': True,
             u'keyword': u'google.com',
             u'path': u'/search',
             u'short_name': u'Google',
             u'supports_replacement': True,
             u'url': u'{google:baseURL}search?q={searchTerms}'},
           { u'display_url': u'http://search.yahoo.com/search?p=%s',
             u'host': u'search.yahoo.com',
             u'in_default_list': True,
             u'is_default': False,
             u'is_valid': True,
             u'keyword': u'yahoo.com',
             u'path': u'/search',
             u'short_name': u'Yahoo!',
             u'supports_replacement': True,
             u'url': u'http://search.yahoo.com/search?p={searchTerms}'},
     """
     # Ensure that the search engine profile is loaded into data model.
-    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'})
+    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'},
+                                   windex=windex)
     cmd_dict = {'command': 'GetSearchEngineInfo'}
-    return self._GetResultFromJSONRequest(cmd_dict)['search_engines']
+    return self._GetResultFromJSONRequest(
+        cmd_dict, windex=windex)['search_engines']
 
-  def AddSearchEngine(self, title, keyword, url):
+  def AddSearchEngine(self, title, keyword, url, windex=0):
     """Add a search engine, as done through the search engines UI.
 
     Args:
       title: name for search engine.
       keyword: keyword, used to initiate a custom search from omnibox.
       url: url template for this search engine's query.
            '%s' is replaced by search query string when used to search.
+      windex: The window index, default is 0.
     """
     # Ensure that the search engine profile is loaded into data model.
-    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'})
+    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'},
+                                   windex=windex)
     cmd_dict = {'command': 'AddOrEditSearchEngine',
                 'new_title': title,
                 'new_keyword': keyword,
                 'new_url': url}
-    self._GetResultFromJSONRequest(cmd_dict)
+    self._GetResultFromJSONRequest(cmd_dict, windex=windex)
 
-  def EditSearchEngine(self, keyword, new_title, new_keyword, new_url):
+  def EditSearchEngine(self, keyword, new_title, new_keyword, new_url,
+                       windex=0):
     """Edit info for existing search engine.
 
     Args:
       keyword: existing search engine keyword.
       new_title: new name for this search engine.
       new_keyword: new keyword for this search engine.
       new_url: new url for this search engine.
+      windex: The window index, default is 0.
     """
     # Ensure that the search engine profile is loaded into data model.
-    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'})
+    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'},
+                                   windex=windex)
     cmd_dict = {'command': 'AddOrEditSearchEngine',
                 'keyword': keyword,
                 'new_title': new_title,
                 'new_keyword': new_keyword,
                 'new_url': new_url}
-    self._GetResultFromJSONRequest(cmd_dict)
+    self._GetResultFromJSONRequest(cmd_dict, windex=windex)
 
-  def DeleteSearchEngine(self, keyword):
+  def DeleteSearchEngine(self, keyword, windex=0):
     """Delete search engine with given keyword.
 
     Args:
       keyword: the keyword string of the search engine to delete.
+      windex: The window index, default is 0.
     """
     # Ensure that the search engine profile is loaded into data model.
-    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'})
+    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'},
+                                   windex=windex)
     cmd_dict = {'command': 'PerformActionOnSearchEngine', 'keyword': keyword,
                 'action': 'delete'}
-    self._GetResultFromJSONRequest(cmd_dict)
+    self._GetResultFromJSONRequest(cmd_dict, windex=windex)
 
-  def MakeSearchEngineDefault(self, keyword):
+  def MakeSearchEngineDefault(self, keyword, windex=0):
     """Make search engine with given keyword the default search.
 
     Args:
       keyword: the keyword string of the search engine to make default.
+      windex: The window index, default is 0.
     """
     # Ensure that the search engine profile is loaded into data model.
-    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'})
+    self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'},
+                                   windex=windex)
     cmd_dict = {'command': 'PerformActionOnSearchEngine', 'keyword': keyword,
                 'action': 'default'}
-    self._GetResultFromJSONRequest(cmd_dict)
+    self._GetResultFromJSONRequest(cmd_dict, windex=windex)
 
   def _EnsureProtectorCheck(self):
     """Ensure that Protector check for changed settings has been performed in
     the current browser session.
 
     No-op if Protector is disabled.
     """
     # Ensure that check for default search engine change has been performed.
     self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'})
 
@@ skipping 4102 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()