Remove ui/gfx/screen_type_delegate.h

chrome/browser/sync/sync_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/sync/sync_error_notifier_ash.h"
 
 #include <stddef.h>
 
 #include "ash/test/ash_test_base.h"
 #include "base/macros.h"
@@ skipping 12 matching lines @@
 #include "components/browser_sync/browser/profile_sync_service_mock.h"
 #include "components/sync_driver/sync_error_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/notification.h"
 
 #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
 
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::_;
 
 namespace ash {
 namespace test {
 
 namespace {
 
 static const char kTestAccountId[] = "testuser@test.com";
 
 // Notification ID corresponding to kProfileSyncNotificationId + kTestAccountId.
 static const std::string kNotificationId =
     "chrome://settings/sync/testuser@test.com";
 
-#if defined(OS_WIN)
-class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate {
- public:
-  ScreenTypeDelegateDesktop() {}
-  ~ScreenTypeDelegateDesktop() override {}
-  gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override {
-    return chrome::IsNativeViewInAsh(view) ?
-        gfx::SCREEN_TYPE_ALTERNATE :
-        gfx::SCREEN_TYPE_NATIVE;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateDesktop);
-};
-#endif
-
 class FakeLoginUIService: public LoginUIService {
  public:
   FakeLoginUIService() : LoginUIService(NULL) {}
   ~FakeLoginUIService() override {}
 };
 
 class FakeLoginUI : public LoginUIService::LoginUI {
  public:
   FakeLoginUI() : focus_ui_call_count_(0) {}
 
@@ skipping 19 matching lines @@
   SyncErrorNotifierTest() {}
   ~SyncErrorNotifierTest() override {}
 
   void SetUp() override {
     DCHECK(TestingBrowserProcess::GetGlobal());
 
     // Set up a desktop screen for Windows to hold native widgets, used when
     // adding desktop widgets (i.e., message center notifications).
 #if defined(OS_WIN)
     test_screen_.reset(aura::TestScreen::Create(gfx::Size()));
-    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
-    gfx::Screen::SetScreenTypeDelegate(&screen_type_delegate_);
+    gfx::Screen::SetScreenInstance(test_screen_.get());
 #endif
 
     AshTestBase::SetUp();
 
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
     profile_ = profile_manager_->CreateTestingProfile(kTestAccountId);
 
@@ skipping 13 matching lines @@
   }
 
   void TearDown() override {
     error_notifier_->Shutdown();
     service_.reset();
     profile_manager_.reset();
 
     AshTestBase::TearDown();
 
 #if defined(OS_WIN)
-    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr);
-    gfx::Screen::SetScreenTypeDelegate(nullptr);
+    gfx::Screen::SetScreenInstance(nullptr);
     test_screen_.reset();
 #endif
 
   }
 
  protected:
   // Utility function to test that SyncErrorNotifier behaves correctly for the
   // given error condition.
   void VerifySyncErrorNotifierResult(GoogleServiceAuthError::State error_state,
                                      bool is_signed_in,
@@ skipping 15 matching lines @@
       ASSERT_TRUE(notification);
       ASSERT_FALSE(notification->title().empty());
       ASSERT_FALSE(notification->title().empty());
       ASSERT_EQ((size_t)1, notification->buttons().size());
     } else {
       ASSERT_FALSE(notification);
     }
   }
 
 #if defined(OS_WIN)
-  ScreenTypeDelegateDesktop screen_type_delegate_;
   scoped_ptr<gfx::Screen> test_screen_;
 #endif
   scoped_ptr<TestingProfileManager> profile_manager_;
   scoped_ptr<SyncErrorController> error_controller_;
   scoped_ptr<SyncErrorNotifier> error_notifier_;
   scoped_ptr<ProfileSyncServiceMock> service_;
   TestingProfile* profile_;
   FakeLoginUI login_ui_;
   NotificationUIManager* notification_ui_manager_;
 
@@ skipping 51 matching lines @@
     SCOPED_TRACE("Not expecting notification since sync setup is incomplete");
     VerifySyncErrorNotifierResult(
         GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
         false /* not signed in */,
         false /* no error */);
   }
 }
 
 }  // namespace test
 }  // namespace ash