Remove SWIGged use of BrowserProxy and TabProxy from PyAuto tests.

chrome/test/functional/https.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.
 
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
 import pyauto_paths
@@ skipping 45 matching lines @@
     self.StopHttpsServer(self._https_server_mismatched)
     self.StopHttpsServer(self._https_server_expired)
     self.StopHttpsServer(self._https_server_ok)
 
   def testSSLProceed(self):
     """Verify able to proceed from an interstitial page."""
     for server in (self._https_server_expired,
                    self._https_server_mismatched):
       url = server.GetURL('google.html').spec()
       self.NavigateToURL(url)
-      tab_proxy = self.GetBrowserWindow(0).GetTab(0)
       # Equivalent to clicking 'proceed anyway' button.
-      self.assertTrue(tab_proxy.TakeActionOnSSLBlockingPage(True),
-                      msg="Did not proceed from the interstitial page.")
+      self.ActionOnSSLBlockingPage(proceed=True)
       self.assertTrue(
           'google' in self.GetActiveTabTitle().lower(),
           msg="Did not correctly proceed from the interstitial page.")
 
   def testSSLGoBack(self):
     """Verify able to go back from the interstitial page to the previous site.
 
     Visits a page with https error and then goes back using Browser::GoBack.
     """
     for server in (self._https_server_expired,
                    self._https_server_mismatched):
       self.NavigateToURL(
           self.GetHttpURLForDataPath('ssl', 'google.html'))
       first_page_title = self.GetActiveTabTitle()
       self.NavigateToURL(
           server.GetURL('google.html').spec())
-      tab_proxy = self.GetBrowserWindow(0).GetTab(0)
       # Equivalent to clicking 'back to safety' button.
-      self.assertTrue(tab_proxy.TakeActionOnSSLBlockingPage(False),
-                      msg="Was not able to go back from the interstitial page.")
+      self.ActionOnSSLBlockingPage(proceed=False)
       self.assertEqual(self.GetActiveTabTitle(), first_page_title,
                        msg="Did not go back to previous page correctly.")
 
   def testSSLCertOK(self):
     """Verify Certificate OK does not display interstitial page.
 
     This test also asserts that the page type is normal.
     """
     url = self._https_server_ok.GetURL('google.html').spec()
     self.NavigateToURL(url)
-    tab_proxy = self.GetBrowserWindow(0).GetTab(0)
-    result_dict = tab_proxy.GetPageType()
+    result_dict = self.GetNavigationInfo()
     self.assertTrue(result_dict, msg='Could not determine the type of the page')
-    page_type_dict = {
-        pyauto.PAGE_TYPE_INTERSTITIAL: 'interstitial',
-        pyauto.PAGE_TYPE_ERROR: 'error'}
     self.assertEqual(
-        result_dict['page_type'], pyauto.PAGE_TYPE_NORMAL,
-        msg='Cert OK did not display page type normal.')
+        result_dict['page_type'], 'NORMAL_PAGE',
+        msg='Cert OK did not display page type normal (page_type=%s).' %
+            result_dict['page_type'])
 
   def testSSLCertIsExpiredAndCertNameMismatches(self):
     """Verify Certificate Expiration and Certificate Mismatched name."""
     for server, cert_status_flag, msg in zip(
         (self._https_server_expired, self._https_server_mismatched),
         (pyauto.CERT_STATUS_DATE_INVALID,
          pyauto.CERT_STATUS_COMMON_NAME_INVALID),
         ('Cert has not expired', 'Cert name does not mismatch')):
       self.NavigateToURL(server.GetURL('google.html').spec())
-      result_dict = self.GetBrowserWindow(0).GetTab(0).GetSecurityState()
+      result_dict = self.GetSecurityState()
       self.assertTrue(result_dict, msg='Could not get security state info')
       self.assertTrue(
           result_dict['ssl_cert_status'] & pyauto.uint32_ptr.frompointer(
               cert_status_flag).value(),
           msg=msg)
 
   def testSSLCertAuthorityOK(self):
     """Verify Certificate OK is valid."""
     self.NavigateToURL(
         self._https_server_mismatched.GetURL('google.html').spec())
-    result_dict = self.GetBrowserWindow(0).GetTab(0).GetSecurityState()
+    result_dict = self.GetSecurityState()
     self.assertTrue(result_dict, msg='Could not get security state info')
     self.assertFalse(
         result_dict['ssl_cert_status'] & pyauto.uint32_ptr.frompointer(
             pyauto.CERT_STATUS_AUTHORITY_INVALID).value(),
         msg='Cert OK is invalid')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()