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

Unified Diff: chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc

Issue 279703005: Remove debug in WallpaperManagerBrowserTest.DisplayChange. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 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
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
index ad86ec43bf3efb12ac627cd99c734969d05b3015..d57d1e776ad2987090cbe65d6992e4755b3f5d49 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
@@ -95,9 +95,6 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest,
ash::test::DisplayManagerTestApi display_manager_test_api(
ash::Shell::GetInstance()->display_manager());
display_manager_test_api.UpdateDisplay(display_specs);
- LOG(ERROR) << "UpdateDisplay(display_specs='" << display_specs
- << "') done.";
- WallpaperManager::GetAppropriateResolutionForTesting();
}
void WaitAsyncWallpaperLoadStarted() {
@@ -642,7 +639,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_SMALL,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(0, observer.GetUpdateWallpaperCountAndReset());
@@ -651,7 +647,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_SMALL,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(0, observer.GetUpdateWallpaperCountAndReset());
@@ -660,7 +655,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_SMALL,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(1, observer.GetUpdateWallpaperCountAndReset());
@@ -670,7 +664,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_LARGE,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(1, observer.GetUpdateWallpaperCountAndReset());
@@ -679,7 +672,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_LARGE,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(1, observer.GetUpdateWallpaperCountAndReset());
@@ -688,7 +680,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_LARGE,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(1, observer.GetUpdateWallpaperCountAndReset());
@@ -698,7 +689,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_SMALL,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(1, observer.GetUpdateWallpaperCountAndReset());
@@ -707,7 +697,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_SMALL,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(1, observer.GetUpdateWallpaperCountAndReset());
@@ -715,7 +704,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
- WallpaperManager::GetAppropriateResolutionForTesting();
EXPECT_EQ(WallpaperManager::WALLPAPER_RESOLUTION_LARGE,
WallpaperManager::Get()->GetAppropriateResolution());
EXPECT_EQ(1, observer.GetUpdateWallpaperCountAndReset());
@@ -724,7 +712,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) {
UpdateDisplay("900x800/r,400x1366");
// Wait for asynchronous DisplayBackgroundController::UpdateDisplay() call.
base::RunLoop().RunUntilIdle();
- WallpaperManager::GetAppropriateResolutionForTesting();
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
EXPECT_EQ(0, observer.GetUpdateWallpaperCountAndReset());
}
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698