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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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> 7 #include <stddef.h>
8 8
9 #include "ash/common/wallpaper/wallpaper_controller.h"
10 #include "ash/common/wm_shell.h"
11 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wallpaper/wallpaper_controller.h"
11 #include "ash/wm_shell.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/message_loop/message_loop.h" 17 #include "base/message_loop/message_loop.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
20 #include "base/time/time.h" 20 #include "base/time/time.h"
21 #include "base/values.h" 21 #include "base/values.h"
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 825
826 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); 826 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
827 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); 827 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
828 828
829 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( 829 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
830 controller_->GetWallpaper(), 830 controller_->GetWallpaper(),
831 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor)); 831 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
832 } 832 }
833 833
834 } // namespace chromeos 834 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698