diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 18:53:10 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 18:53:10 +0000 |
| commit | 48f5edd28642cdfa5a73a9a8554cb9ce5ca32aef (patch) | |
| tree | 135ad728cc531ae18e5fd1c85e67c347d0feb11a /chrome/browser/signin | |
| parent | bad46900b5bfe47ce3690d4c8bf507427c06cf66 (diff) | |
| download | chromium_src-48f5edd28642cdfa5a73a9a8554cb9ce5ca32aef.zip chromium_src-48f5edd28642cdfa5a73a9a8554cb9ce5ca32aef.tar.gz chromium_src-48f5edd28642cdfa5a73a9a8554cb9ce5ca32aef.tar.bz2 | |
aura: Make sure TestScreen objects are destroyed properly.
BUG=none
R=sky@chromium.org
TBR=pfeldman@ for content/shell/ changes
Review URL: https://codereview.chromium.org/344833004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/signin')
| -rw-r--r-- | chrome/browser/signin/signin_error_notifier_ash_unittest.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc index 308b977..4946745 100644 --- a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc +++ b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc @@ -24,7 +24,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/message_center/notification.h" -#if !defined(OS_CHROMEOS) +#if defined(OS_WIN) #include "chrome/browser/ui/ash/ash_util.h" #include "ui/aura/test/test_screen.h" #include "ui/gfx/screen.h" @@ -45,7 +45,7 @@ static const std::string kNotificationId = "chrome://settings/signin/testuser@test.com"; } -#if !defined(OS_CHROMEOS) +#if defined(OS_WIN) class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate { public: ScreenTypeDelegateDesktop() {} @@ -79,8 +79,8 @@ class SigninErrorNotifierTest : public AshTestBase { // Set up screen for Windows. #if defined(OS_WIN) - aura::TestScreen* test_screen = aura::TestScreen::Create(gfx::Size()); - gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen); + test_screen_.reset(aura::TestScreen::Create(gfx::Size())); + gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateDesktop); #endif @@ -92,6 +92,9 @@ class SigninErrorNotifierTest : public AshTestBase { } virtual void TearDown() OVERRIDE { +#if defined(OS_WIN) + test_screen_.reset(); +#endif profile_manager_.reset(); AshTestBase::TearDown(); @@ -105,6 +108,9 @@ class SigninErrorNotifierTest : public AshTestBase { *message = notification->message(); } +#if defined(OS_WIN) + scoped_ptr<gfx::Screen> test_screen_; +#endif scoped_ptr<TestingProfileManager> profile_manager_; scoped_ptr<TestingProfile> profile_; SigninErrorController* error_controller_; |