Remove ui/gfx/screen_type_delegate.h

chrome/browser/sync/sync_error_notifier_ash_unittest.cc

Index: chrome/browser/sync/sync_error_notifier_ash_unittest.cc
diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
index 03c0f01aad80a1962c7165252342b4c607c9c829..edc7accb9191fd2d81ba34e8b11e8e25ac73bfde 100644
--- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
+++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
@@ -30,7 +30,6 @@
 #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;
@@ -49,22 +48,6 @@ static const char kTestAccountId[] = "testuser@test.com";
 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) {}
@@ -104,8 +87,7 @@ class SyncErrorNotifierTest : public AshTestBase  {
     // 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();
@@ -139,8 +121,7 @@ class SyncErrorNotifierTest : public AshTestBase  {
     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
 
@@ -176,7 +157,6 @@ class SyncErrorNotifierTest : public AshTestBase  {
   }
 
 #if defined(OS_WIN)
-  ScreenTypeDelegateDesktop screen_type_delegate_;
   scoped_ptr<gfx::Screen> test_screen_;
 #endif
   scoped_ptr<TestingProfileManager> profile_manager_;