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

Unified Diff: ui/display/chromeos/display_configurator_unittest.cc

Issue 796263002: Remove synchronous GetDisplays() and Configure() from NativeDisplayDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@async-refactor5
Patch Set: Removed deprecated calls from TestNativeDisplayDelegate and update the ExternalControl test Created 6 years 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: ui/display/chromeos/display_configurator_unittest.cc
diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc
index b932f56db905d7df19551683126dbf764ec57d73..55fe4045eca00b65dc6509cdee9e3bb031745695 100644
--- a/ui/display/chromeos/display_configurator_unittest.cc
+++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -1175,12 +1175,13 @@ TEST_F(DisplayConfiguratorTest, ExternalControl) {
NULL),
log_->GetActionsAndClear());
configurator_.TakeControl();
- EXPECT_EQ(
- JoinActions(
- kTakeDisplayControl,
- GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
- NULL),
- log_->GetActionsAndClear());
+ EXPECT_EQ(JoinActions(kTakeDisplayControl, kGrab,
+ GetFramebufferAction(small_mode_.size(), &outputs_[0],
+ nullptr).c_str(),
+ GetCrtcAction(outputs_[0], &small_mode_,
+ gfx::Point(0, 0)).c_str(),
+ kUngrab, NULL),
+ log_->GetActionsAndClear());
}
} // namespace test
« no previous file with comments | « ui/display/chromeos/display_configurator.cc ('k') | ui/display/chromeos/test/test_native_display_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698