Rename gfx::Display/Screen to display::Display/Screen in chrome

chrome/browser/chromeos/power/extension_event_observer_unittest.cc

 // Copyright 2015 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/chromeos/power/extension_event_observer.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 16 matching lines @@
 #include "content/public/test/test_renderer_host.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_host_observer.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/test_screen.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 namespace chromeos {
 
 class ExtensionEventObserverTest : public ::testing::Test {
  public:
   ExtensionEventObserverTest()
       : power_manager_client_(new FakePowerManagerClient()),
         test_screen_(aura::TestScreen::Create(gfx::Size())),
         fake_user_manager_(new FakeChromeUserManager()),
         scoped_user_manager_enabler_(fake_user_manager_) {
@@ skipping 10 matching lines @@
   ~ExtensionEventObserverTest() override {
     extension_event_observer_.reset();
     profile_manager_.reset();
     DBusThreadManager::Shutdown();
   }
 
   // ::testing::Test overrides.
   void SetUp() override {
     ::testing::Test::SetUp();
 
-    gfx::Screen::SetScreenInstance(test_screen_.get());
+    display::Screen::SetScreenInstance(test_screen_.get());
 
     // Must be called from ::testing::Test::SetUp.
     ASSERT_TRUE(profile_manager_->SetUp());
 
     const char kUserProfile[] = "profile1@example.com";
     const AccountId account_id(AccountId::FromUserEmail(kUserProfile));
     fake_user_manager_->AddUser(account_id);
     fake_user_manager_->LoginUser(account_id);
     profile_ =
         profile_manager_->CreateTestingProfile(account_id.GetUserEmail());
 
     profile_manager_->SetLoggedIn(true);
   }
   void TearDown() override {
     profile_ = NULL;
     profile_manager_->DeleteAllTestingProfiles();
-    gfx::Screen::SetScreenInstance(nullptr);
+    display::Screen::SetScreenInstance(nullptr);
     ::testing::Test::TearDown();
   }
 
  protected:
   scoped_refptr<extensions::Extension> CreateApp(const std::string& name,
                                                  bool uses_gcm) {
     scoped_refptr<extensions::Extension> app =
         extensions::ExtensionBuilder()
             .SetManifest(
                 extensions::DictionaryBuilder()
@@ skipping 231 matching lines @@
   EXPECT_FALSE(test_api_->MaybeRunSuspendReadinessCallback());
   EXPECT_EQ(0, power_manager_client_->GetNumPendingSuspendReadinessCallbacks());
 
   // Test that the ExtensionEventObserver does not delay suspend attempts when
   // it is disabled.
   power_manager_client_->SendDarkSuspendImminent();
   EXPECT_EQ(0, power_manager_client_->GetNumPendingSuspendReadinessCallbacks());
 }
 
 }  // namespace chromeos