summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.h
diff options
context:
space:
mode:
authorcraigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 03:07:38 +0000
committercraigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 03:07:38 +0000
commit550b589c5e7ac25afb6d91a5734d623e82e4539b (patch)
treed69193e514ea130dc8c03486b93425d40ebb62b0 /chrome/test/ui/ui_test.h
parentcc15ae3cc532cad6b3d8ca88bba23545cf4213a4 (diff)
downloadchromium_src-550b589c5e7ac25afb6d91a5734d623e82e4539b.zip
chromium_src-550b589c5e7ac25afb6d91a5734d623e82e4539b.tar.gz
chromium_src-550b589c5e7ac25afb6d91a5734d623e82e4539b.tar.bz2
Add checks in pyautolib.cc for a NULL automation proxy pointer.
BUG=None TEST=PyAuto tests still work. Review URL: https://chromiumcodereview.appspot.com/10332224 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.h')
-rw-r--r--chrome/test/ui/ui_test.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 167a00d..8a9947f 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -256,9 +256,7 @@ class UITestBase {
// Closes the browser window.
virtual void TearDown();
- AutomationProxy* automation() const {
- return launcher_->automation();
- }
+ virtual AutomationProxy* automation() const;
ProxyLauncher::LaunchState DefaultLaunchState();