Convert PyAuto's NavigateToURL, GetActiveTabIndex, Refresh, RefreshActiveTab, and AppendTab to the …

chrome/test/pyautolib/pyauto.py

Index: chrome/test/pyautolib/pyauto.py
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index 5b870da306edfd86ffe45e4c86003493d2ecc8c6..c93fa5ed9f2e36bae460c27a888f9463263fbd78 100755
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -1057,6 +1057,87 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
       raise JSONInterfaceError(ret_dict['error'])
     return ret_dict
 
+  def NavigateToURL(self, url, windex=0, tab_index=0, navigation_count=1):
+    """Navigate the given tab to the given URL.
+
+    Note that this method also activates the corresponding tab/window
+    if it's not active already. Blocks until page has loaded.
+
+    Args:
+      url: The URL to which to navigate.
+      windex: The index of the browser window to work on. Defaults to the first
+          window.
+      tab_index: The index of the tab to work on. Defaults to the first tab.
+      navigation_count: the number of navigations to wait for. Defaults to 1.
+    """
+    cmd_dict = {
+        'command': 'NavigateToURL',
+        'url': url,
+        'windex': windex,
+        'tab_index': tab_index,
+        'navigation_count': navigation_count,
+    }
+    self._GetResultFromJSONRequest(cmd_dict, windex=windex)
+
+  def ReloadTab(self, windex, tab_index):
+    """Reload the given tab.
+
+    Blocks until the page has reloaded.
+
+    Args:
+      windex: The index of the browser window to work on.
+      tab_index: The index of the tab to reload.
+    """
+    cmd_dict = {
+        'command': 'Reload',
+        'windex': windex,
+        'tab_index': tab_index,
+    }
+    self._GetResultFromJSONRequest(cmd_dict, windex=windex)
+
+  def ReloadActiveTab(self, windex=0):
+    """Reload an active tab.
+
+    Args:
+      windex: The index of the browser window to work on. Defaults to the first
+          window.
+    """
+    self.ReloadTab(windex, self.GetActiveTabIndex(windex))
+
+  def GetActiveTabIndex(self, windex=0):
+    """Get the index of the currently active tab in the given browser window.
+
+    Args:
+      windex: The index of the browser window to work on. Defaults to the first
+          window.
+    """
+    cmd_dict = {
+        'command': 'GetActiveTabIndex',
+        'windex': windex,
+    }
+    return self._GetResultFromJSONRequest(cmd_dict,
+                                          windex=windex).get('tab_index')
+
+  def AppendTab(self, url, windex=0):
+    """Append a new tab.
+
+    Create a new tab at the end of given or first browser window and activate
+    it. Blocks until the page is loaded.
+
+    Args:
+      url: The url to load, can be string or a GURL object.
+      windex: The index of the browser window to work on. Defaults to the first
+          window.
+    """
+    if isinstance(url, GURL):
+      url = url.spec()
+    cmd_dict = {
+        'command': 'AppendTab',
+        'url': url,
+        'windex': windex,
+    }
+    return self._GetResultFromJSONRequest(cmd_dict, windex=windex).get('result')
+
   def GetBookmarkModel(self, windex=0):
     """Return the bookmark model as a BookmarkModel object.
 
@@ -3161,25 +3242,6 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
     }
     return self._GetResultFromJSONRequest(cmd_dict, windex=None)
 
-  def AppendTab(self, url, windex=0):
-    """Create a new tab.
-
-    Create a new tab at the end of given or first browser window
-    and activate it. Blocks until the url is loaded.
-
-    Args:
-      url: The url to load, can be string or a GURL object.
-      windex: Index of the window to open a tab in. Default 0 - first window.
-
-    Returns:
-      True on success.
-    """
-    if type(url) is GURL:
-      gurl = url
-    else:
-      gurl = GURL(url)
-    return pyautolib.PyUITestBase.AppendTab(self, gurl, windex)
-
   def WaitUntilNavigationCompletes(self, tab_index=0, windex=0):
     """Wait until the specified tab is done navigating.