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

Side by Side Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
6 6
7 #include <stddef.h>
8
7 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/desktop_background/desktop_background_controller_observer.h" 10 #include "ash/desktop_background/desktop_background_controller_observer.h"
9 #include "ash/desktop_background/desktop_background_controller_test_api.h" 11 #include "ash/desktop_background/desktop_background_controller_test_api.h"
10 #include "ash/display/display_manager.h" 12 #include "ash/display/display_manager.h"
11 #include "ash/shell.h" 13 #include "ash/shell.h"
12 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
13 #include "ash/test/ash_test_helper.h" 15 #include "ash/test/ash_test_helper.h"
14 #include "ash/test/display_manager_test_api.h" 16 #include "ash/test/display_manager_test_api.h"
15 #include "ash/test/test_user_wallpaper_delegate.h" 17 #include "ash/test/test_user_wallpaper_delegate.h"
16 #include "base/command_line.h" 18 #include "base/command_line.h"
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 843
842 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); 844 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
843 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); 845 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
844 846
845 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( 847 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
846 controller_->GetWallpaper(), 848 controller_->GetWallpaper(),
847 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor)); 849 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
848 } 850 }
849 851
850 } // namespace chromeos 852 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698