diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 17:52:19 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 17:52:19 +0000 |
| commit | 790788ac7de91db6f349a0ecd1c98fd240b73ca2 (patch) | |
| tree | 7fa4cb0c072c2e9d75b9654284273af55cf8586f /chrome/test/pyautolib | |
| parent | 86ba6fa82610b38aaf45e3a5497320ddcfb87d79 (diff) | |
| download | chromium_src-790788ac7de91db6f349a0ecd1c98fd240b73ca2.zip chromium_src-790788ac7de91db6f349a0ecd1c98fd240b73ca2.tar.gz chromium_src-790788ac7de91db6f349a0ecd1c98fd240b73ca2.tar.bz2 | |
Add support for basic extension automation through the Automation Proxy.
BUG=36171
TEST=none
Review URL: http://codereview.chromium.org/1048002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib')
| -rw-r--r-- | chrome/test/pyautolib/pyautolib.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/test/pyautolib/pyautolib.cc b/chrome/test/pyautolib/pyautolib.cc index 84bdd18..39a5b32 100644 --- a/chrome/test/pyautolib/pyautolib.cc +++ b/chrome/test/pyautolib/pyautolib.cc @@ -5,6 +5,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "chrome/test/automation/extension_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/pyautolib/pyautolib.h" #include "googleurl/src/gurl.h" @@ -156,7 +157,9 @@ bool PyUITestBase::OpenNewBrowserWindow(bool show) { } bool PyUITestBase::InstallExtension(const FilePath& crx_file) { - return automation()->InstallExtension(crx_file); + scoped_refptr<ExtensionProxy> proxy = + automation()->InstallExtension(crx_file); + return proxy.get() != NULL; } bool PyUITestBase::GetBookmarkBarVisibility() { @@ -274,7 +277,6 @@ scoped_refptr<BrowserProxy> PyUITestBase::GetBrowserWindow(int window_index) { return automation()->GetBrowserWindow(window_index); } - std::string PyUITestBase::_SendJSONRequest(int window_index, std::string& request) { scoped_refptr<BrowserProxy> browser_proxy = @@ -286,4 +288,3 @@ std::string PyUITestBase::_SendJSONRequest(int window_index, } return response; } - |