diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-30 04:05:00 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-30 04:05:00 +0000 |
| commit | 3f6e918eb83d514ac38a49f64485b70b488b8626 (patch) | |
| tree | 215a29b2f766f1d8572d3215a8c34ed3cda9ca7c /chrome/test | |
| parent | 58da826e9ebe4d60ff1c73e52a1b5a03ab67cadc (diff) | |
| download | chromium_src-3f6e918eb83d514ac38a49f64485b70b488b8626.zip chromium_src-3f6e918eb83d514ac38a49f64485b70b488b8626.tar.gz chromium_src-3f6e918eb83d514ac38a49f64485b70b488b8626.tar.bz2 | |
UITest class should derive from PlatformTest instead of testing::Test
This is so that ui tests using UITest have a valid NSAutoreleasePool, which
PlatformTest provides, but testing::Test does not.
Review URL: http://codereview.chromium.org/519026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 661e9a5..1cf62c7 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -96,7 +96,7 @@ const char kEnableErrorDialogs[] = "enable-errdialogs"; // #define WAIT_FOR_DEBUGGER_ON_OPEN 1 UITest::UITest() - : testing::Test(), + : PlatformTest(), launch_arguments_(CommandLine::ARGUMENTS_ONLY), expected_errors_(0), expected_crashes_(0), diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index 8d8331c..d47a5d0 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -31,7 +31,7 @@ // AutomationProxy here, but many files that #include this one don't // themselves #include automation_proxy.h. #include "chrome/test/automation/automation_proxy.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "testing/platform_test.h" class AutomationProxy; class BrowserProxy; @@ -40,7 +40,7 @@ class FilePath; class GURL; class TabProxy; -class UITest : public testing::Test { +class UITest : public PlatformTest { protected: // String to display when a test fails because the crash service isn't // running. |