aura: Make sure TestScreen objects are destroyed properly.

chrome/browser/signin/signin_error_notifier_ash_unittest.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/signin/signin_error_notifier_ash.h"
 
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/notification.h"
 
-#if !defined(OS_CHROMEOS)

[sky, 2014/06/19 20:33:20]

Don't we want to run this on linux non-chromeos? Same comment for all of them.

[sadrul, 2014/06/19 21:31:51]

It doesn't look like this is actually used/needed on non-Win (see below in line
81).

+#if defined(OS_WIN)
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/screen_type_delegate.h"
 #endif
 
 namespace ash {
 namespace test {
 
 namespace {
 
 static const char kTestAccountId[] = "testuser@test.com";
 static const char kTestUsername[] = "testuser@test.com";
 
 // Notification ID corresponding to kProfileSigninNotificationId +
 // kTestAccountId.
 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() {}
   virtual gfx::ScreenType GetScreenTypeForNativeView(
       gfx::NativeView view) OVERRIDE {
     return chrome::IsNativeViewInAsh(view) ?
         gfx::SCREEN_TYPE_ALTERNATE :
         gfx::SCREEN_TYPE_NATIVE;
   }
  private:
@@ skipping 13 matching lines @@
 
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
     TestingBrowserProcess::GetGlobal();
     AshTestBase::SetUp();
 
     // 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
 
     error_controller_ =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())->
             signin_error_controller();
     SigninErrorNotifierFactory::GetForProfile(profile_.get());
     notification_ui_manager_ = g_browser_process->notification_ui_manager();
   }
 
   virtual void TearDown() OVERRIDE {
+#if defined(OS_WIN)
+    test_screen_.reset();
+#endif
     profile_manager_.reset();
 
     AshTestBase::TearDown();
   }
 
  protected:
   void GetMessage(base::string16* message) {
     const Notification* notification =
         g_browser_process->notification_ui_manager()->FindById(kNotificationId);
     ASSERT_FALSE(notification == NULL);
     *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_;
   NotificationUIManager* notification_ui_manager_;
 };
 
 TEST_F(SigninErrorNotifierTest, NoErrorAuthStatusProviders) {
   ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
   {
     // Add a provider (removes itself on exiting this scope).
@@ skipping 113 matching lines @@
       EXPECT_FALSE(notification->title().empty());
       EXPECT_FALSE(notification->message().empty());
       EXPECT_EQ((size_t)1, notification->buttons().size());
     }
   }
 }
 #endif
 
 }  // namespace test
 }  // namespace ash