Exposed GetSecurityState and GetPageType to pyAuto.

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
 
 // When adding a new class or method, make sure you specify the doc string using
 // %feature("docstring", "doc string goes here") NODENAME;
 // and attach it to your node (class or method). This doc string will be
 // copied over in the generated python classes/methods.
 
 %module(docstring="Python interface to Automation Proxy.") pyautolib
 %feature("autodoc", "1");
 
+%include <cpointer.i>
 %include <std_wstring.i>
 %include <std_string.i>

[dennis_jeffrey, 2012/03/14 21:55:27]

nit: swap above 2 lines for alphabetical order (assuming order doesn't matter)

[dyu1, 2012/03/14 22:32:32]

Done.

+%include <typemaps.i>
 
 %include "chrome/test/pyautolib/argc_argv.i"
 
 // NOTE: All files included in this file should also be listed under
 //       pyautolib_sources in chrome_tests.gypi.
 
 // Headers that can be swigged directly.
 %include "chrome/app/chrome_command_ids.h"
 %include "chrome/app/chrome_dll_resource.h"
 %include "chrome/common/automation_constants.h"
 %include "chrome/common/pref_names.h"
+%include "content/public/common/page_type.h"
+%include "content/public/common/security_style.h"
+%include "net/base/net_export.h"
+%include "net/base/cert_status_flags.h"

[dennis_jeffrey, 2012/03/14 21:55:27]

If order is important here, maybe we should have a comment to state this
explicitly so people know that?

[dyu1, 2012/03/14 22:32:32]

Done.

 
 %{
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/pyautolib/pyautolib.h"
 #include "net/test/test_server.h"
 %}
 
@@ skipping 97 matching lines @@
   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));

[dennis_jeffrey, 2012/03/14 21:55:27]

recommend this indentation:

PyDict_SetItem(result_dict,
               PyString_FromString("insecure_content_status"),
               PyInt_FromLong(insecure_content_status));

[dyu1, 2012/03/14 22:32:32]

Done.

+      }
+      return result_dict;
+    }
+  };
+  %extend {
+    %feature("docstring", "Returns the type of page currently showing "
+             "(normal, interstitial, error.")
+        GetPageType;
+    PyObject* GetPageType(){

[dennis_jeffrey, 2012/03/14 21:55:27]

add a space before the {

[dyu1, 2012/03/14 22:32:32]

Done.

+      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;
+    }
+  };
 
   // HTTP Auth
   %feature("docstring",
       "Checks if this tab has a login prompt waiting for auth.  This will be "
       "true if a navigation results in a login prompt, and if an attempted "
       "login fails. "
       "Note that this is only valid if you've done a navigation on this same "
       "object; different TabProxy objects can refer to the same Tab.  Calls "
       "that can set this are NavigateToURL, GoBack, and GoForward. ")
       NeedsAuth;
@@ skipping 308 matching lines @@
     CERT_EXPIRED,
   };
 
   // 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);