Remove ui/gfx/screen_type_delegate.h

extensions/browser/api/system_display/system_display_apitest.cc

 // Copyright 2013 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 <stdint.h>
 
 #include <utility>
 
 #include "base/debug/leak_annotations.h"
 #include "base/macros.h"
@@ skipping 124 matching lines @@
 
 class SystemDisplayApiTest : public ShellApiTest {
  public:
   SystemDisplayApiTest()
       : provider_(new MockDisplayInfoProvider), screen_(new MockScreen) {}
 
   ~SystemDisplayApiTest() override {}
 
   void SetUpOnMainThread() override {
     ShellApiTest::SetUpOnMainThread();
-    ANNOTATE_LEAKING_OBJECT_PTR(
-        gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE));
-    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
+    ANNOTATE_LEAKING_OBJECT_PTR(gfx::Screen::GetScreen());
+    gfx::Screen::SetScreenInstance(screen_.get());
     DisplayInfoProvider::InitializeForTesting(provider_.get());
   }
 
  protected:
   scoped_ptr<MockDisplayInfoProvider> provider_;
   scoped_ptr<gfx::Screen> screen_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemDisplayApiTest);
 };
@@ skipping 138 matching lines @@
     enable_unified_function->set_extension(test_extension.get());
     ASSERT_TRUE(api_test_utils::RunFunction(enable_unified_function.get(),
                                             "[false]", browser_context()));
     EXPECT_FALSE(provider_->unified_desktop_enabled());
   }
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace extensions