summaryrefslogtreecommitdiffstats
path: root/chrome/test/pyautolib
diff options
context:
space:
mode:
authorprachij@chromium.org <prachij@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 00:08:28 +0000
committerprachij@chromium.org <prachij@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 00:08:28 +0000
commitca7bf99722aba545be42a6bff618c9cfa020941f (patch)
tree12f834f74b65fc19c9d5ce74279a254ac9d516c7 /chrome/test/pyautolib
parent06041ec579cc0b6adc56acbfd2f6ffdeade63046 (diff)
downloadchromium_src-ca7bf99722aba545be42a6bff618c9cfa020941f.zip
chromium_src-ca7bf99722aba545be42a6bff618c9cfa020941f.tar.gz
chromium_src-ca7bf99722aba545be42a6bff618c9cfa020941f.tar.bz2
one line description: changed getprotector state method
Additional details: BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/9375018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib')
-rwxr-xr-xchrome/test/pyautolib/pyauto.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index ca7f25b..66d5431 100755
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -1167,12 +1167,15 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
# Ensure that check for default search engine change has been performed.
self._GetResultFromJSONRequest({'command': 'LoadSearchEngineInfo'})
- def GetProtectorState(self):
+ def GetProtectorState(self, window_index=0):
"""Returns current Protector state.
This will trigger Protector's check for changed settings if it hasn't been
performed yet.
+ Args:
+ window_index: The window index, default is 0.
+
Returns:
A dictionary.
Example:
@@ -1181,7 +1184,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
"""
self._EnsureProtectorCheck()
cmd_dict = {'command': 'GetProtectorState'}
- return self._GetResultFromJSONRequest(cmd_dict)
+ return self._GetResultFromJSONRequest(cmd_dict, windex=window_index)
def ApplyProtectorChange(self):
"""Applies the change shown by Protector and closes the bubble.