Remove SWIGged use of BrowserProxy and TabProxy from PyAuto tests.

chrome/test/pyautolib/pyautolib.i

 // 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.
 //
 // Swig Interface for PyAuto.
 // PyAuto makes the Automation Proxy interface available in Python
 //
 // Running swig as:
 //   swig -python -c++ chrome/test/pyautolib/pyautolib.i
 // would generate pyautolib.py, pyautolib_wrap.cxx
@@ skipping 43 matching lines @@
 template <class T>
 class scoped_refptr {
  public:
   scoped_refptr();
   scoped_refptr(T* p);
   ~scoped_refptr();
 
   T* get() const;
   T* operator->() const;
 };
-%template(scoped_refptr__BrowserProxy) scoped_refptr<BrowserProxy>;
-%template(scoped_refptr__TabProxy) scoped_refptr<TabProxy>;
 
 // GURL
 %feature("docstring", "Represent a URL. Call spec() to get the string.") GURL;
 class GURL {
  public:
   GURL();
   explicit GURL(const std::string& url_string);
   %feature("docstring", "Get the string representation.") spec;
   const std::string& spec() const;
 };
 
 // FilePath
 %feature("docstring",
          "Represent a file path. Call value() to get the string.") FilePath;
 class FilePath {
  public:
   %feature("docstring", "Get the string representation.") value;
 #ifdef SWIGWIN
   typedef std::wstring StringType;
 #else
   typedef std::string StringType;
 #endif  // SWIGWIN
   const StringType& value() const;
   %feature("docstring", "Construct an empty FilePath from a string.")
       FilePath;
   FilePath();
   explicit FilePath(const StringType& path);
 };
 
-// BrowserProxy
-%feature("docstring", "Proxy handle to a browser window.") BrowserProxy;
-%nodefaultctor BrowserProxy;
-%nodefaultdtor BrowserProxy;
-class BrowserProxy {
- public:
-  %feature("docstring", "Activate the tab at the given zero-based index")
-      ActivateTab;
-  bool ActivateTab(int tab_index);
-
-  %feature("docstring", "Activate the browser's window and bring it to front.")
-      BringToFront;
-  bool BringToFront();
-
-  %feature("docstring", "Get proxy to the tab at the given zero-based index")
-      GetTab;
-  scoped_refptr<TabProxy> GetTab(int tab_index) const;
-};
-
-// TabProxy
-%feature("docstring", "Proxy handle to a tab.") TabProxy;
-%nodefaultctor TabProxy;
-%nodefaultdtor TabProxy;
-class TabProxy {
- public:
-  // Navigation
-  %feature("docstring", "Navigates to a given GURL. "
-           "Blocks until the navigation completes. ") NavigateToURL;
-  AutomationMsg_NavigationResponseValues NavigateToURL(const GURL& url);
-  %feature("docstring", "Navigates to a given GURL. Blocks until the given "
-           "number of navigations complete.")
-      NavigateToURLBlockUntilNavigationsComplete;
-  AutomationMsg_NavigationResponseValues
-      NavigateToURLBlockUntilNavigationsComplete(
-          const GURL& url, int number_of_navigations);
-  %feature("docstring", "Navigates to a given GURL asynchronously. "
-           "Does not wait for the navigation to complete, or even begin; "
-           "Use NavigateToURL() if you want to wait.") NavigateToURLAsync;
-  bool TabProxy::NavigateToURLAsync(const GURL& url);
-  %feature("docstring", "Equivalent to hitting the Back button. "
-           "Blocks until navigation completes.") GoBack;
-  AutomationMsg_NavigationResponseValues GoBack();
-  %feature("docstring", "Equivalent to hitting the Forward button. "
-           "Blocks until navigation completes.") GoForward;
-  AutomationMsg_NavigationResponseValues GoForward();
-  %feature("docstring", "Equivalent to hitting the Reload button. "
-           "Blocks until navigation completes.") Reload;
-  AutomationMsg_NavigationResponseValues Reload();
-  %feature("docstring", "Closes the tab. Supply True to wait "
-           "until the tab has closed, else it'll wait only until the call "
-           "has been initiated. Be careful while closing the last tab "
-           "since it might close the browser.") Close;
-  bool Close();
-  bool Close(bool wait_until_closed);
-  %feature("docstring", "Blocks until tab is completely restored.")
-      WaitForTabToBeRestored;
-  bool WaitForTabToBeRestored(uint32 timeout_ms);
-  %feature("docstring", "Simulates user action on the SSL blocking page."
-          "if |proceed| is true, this is equivalent to clicking the 'Proceed' "
-          "button, if false to 'Take me out of there' button.")
-      TakeActionOnSSLBlockingPage;
-  bool TakeActionOnSSLBlockingPage(bool proceed);
-  %extend {
-    %feature("docstring", "Retrieves the different security states for the "
-             "current tab.")
-        GetSecurityState;
-    PyObject* GetSecurityState() {
-      content::SecurityStyle security_style;
-      net::CertStatus ssl_cert_status;
-      int insecure_content_status;
-      PyObject* result_dict = PyDict_New();
-      if ($self->GetSecurityState(
-          &security_style, &ssl_cert_status, &insecure_content_status)) {
-        PyDict_SetItem(result_dict, PyString_FromString("security_style"),
-                       PyInt_FromLong(security_style));
-        PyDict_SetItem(result_dict, PyString_FromString("ssl_cert_status"),
-                       PyInt_FromLong(ssl_cert_status));
-        PyDict_SetItem(result_dict,
-                       PyString_FromString("insecure_content_status"),
-                       PyInt_FromLong(insecure_content_status));
-      }
-      return result_dict;
-    }
-  };
-  %extend {
-    %feature("docstring", "Returns the type of page currently showing "
-             "(normal, interstitial, error.")
-        GetPageType;
-    PyObject* GetPageType() {
-      content::PageType page_type;
-      PyObject* result_dict = PyDict_New();
-      if ($self->GetPageType(&page_type)) {
-        PyDict_SetItem(result_dict, PyString_FromString("page_type"),
-                       PyInt_FromLong(page_type));
-      }
-      return result_dict;
-    }
-  };
-
-};
-
 class PyUITestSuiteBase {
  public:
   %feature("docstring", "Create the suite.") PyUITestSuiteBase;
   PyUITestSuiteBase(int argc, char** argv);
   virtual ~PyUITestSuiteBase();
 
   %feature("docstring", "Initialize from the path to browser dir.")
       InitializeWithPath;
   void InitializeWithPath(const FilePath& browser_dir);
   %feature("docstring", "Set chrome source root path, used in some tests")
@@ skipping 118 matching lines @@
                         int window_index=0);
 
   %feature("docstring", "Set the URL of a bookmark.") SetBookmarkURL;
   bool SetBookmarkURL(std::wstring id,
                       const std::wstring url,
                       int window_index=0);
 
   %feature("docstring", "Remove (delete) a bookmark.") RemoveBookmark;
   bool RemoveBookmark(std::wstring id, int window_index=0);
 
-  // Misc methods
-  %feature("docstring", "Get a proxy to the browser window at the given "
-                        "zero-based index.") GetBrowserWindow;
-  scoped_refptr<BrowserProxy> GetBrowserWindow(int window_index);
-
   // Meta-method
   %feature("docstring", "Send a sync JSON request to Chrome.  "
                         "Returns a JSON dict as a response.  "
                         "Given timeout in milliseconds."
                         "Internal method.")
       _SendJSONRequest;
   std::string _SendJSONRequest(int window_index,
                                const std::string& request,
                                int timeout);
 
@@ skipping 72 matching lines @@
   // Initialize a new HTTPSOptions that will use the specified certificate.
   explicit HTTPSOptions(ServerCertificate cert);
 };
 
 %{
 typedef net::TestServer::HTTPSOptions HTTPSOptions;
 %}
 
 %pointer_class(int, int_ptr);
 %pointer_class(uint32, uint32_ptr);