chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc - Issue 2885153004: React to primary display change instead of removal

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc

Issue 2885153004: React to primary display change instead of removal (Closed)

Patch Set: Remove the probably unnecessary safe guards for test shutdown Created 3 years, 7 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

« chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc ('K') | « chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc

index 517ec783ae834b9125449de84635e146ed66bfe4..acf074ae225fd6af55f93ded65c3882bc3763420 100644

--- a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc

+++ b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc

@@ -9,6 +9,7 @@

#include "ash/display/display_configuration_controller.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

+#include "base/run_loop.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/display/display.h"

#include "ui/display/display_observer.h"

@@ -63,6 +64,7 @@ TEST_F(OobeDisplayChooserTest, PreferTouchAsPrimary) {

EXPECT_EQ(ids[0], GetPrimaryDisplay());

display_chooser.TryToPlaceUiOnTouchDisplay();

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(ids[1], GetPrimaryDisplay());

}

@@ -77,6 +79,7 @@ TEST_F(OobeDisplayChooserTest, AddingSecondTouchDisplayShouldbeNOP) {

EXPECT_EQ(ids[0], GetPrimaryDisplay());

display_chooser.TryToPlaceUiOnTouchDisplay();

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(ids[0], GetPrimaryDisplay());

}