Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3841)

Unified Diff: chrome/browser/chromeos/power/extension_event_observer_unittest.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/power/extension_event_observer_unittest.cc
diff --git a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
index 4557fa0ba2990288fa4cd07b4d381ee8d2e931ad..dfd58c15c5b7d6d7134180f43c2b417ce21da3c0 100644
--- a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
+++ b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
@@ -64,7 +64,7 @@ class ExtensionEventObserverTest : public ::testing::Test {
void SetUp() override {
::testing::Test::SetUp();
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
+ gfx::Screen::SetScreenInstance(test_screen_.get());
// Must be called from ::testing::Test::SetUp.
ASSERT_TRUE(profile_manager_->SetUp());
@@ -81,7 +81,7 @@ class ExtensionEventObserverTest : public ::testing::Test {
void TearDown() override {
profile_ = NULL;
profile_manager_->DeleteAllTestingProfiles();
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr);
+ gfx::Screen::SetScreenInstance(nullptr);
::testing::Test::TearDown();
}

Powered by Google App Engine
This is Rietveld 408576698