chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc - Issue 286933002: [cros login] Split login related classes into subfolders.

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

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix includes in new tests 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/wallpaper_manager.h"	5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

6	6

7 #include "ash/desktop_background/desktop_background_controller.h"	7 #include "ash/desktop_background/desktop_background_controller.h"

8 #include "ash/desktop_background/desktop_background_controller_observer.h"	8 #include "ash/desktop_background/desktop_background_controller_observer.h"

9 #include "ash/desktop_background/desktop_background_controller_test_api.h"	9 #include "ash/desktop_background/desktop_background_controller_test_api.h"

10 #include "ash/display/display_manager.h"	10 #include "ash/display/display_manager.h"

11 #include "ash/shell.h"	11 #include "ash/shell.h"

12 #include "ash/test/ash_test_base.h"	12 #include "ash/test/ash_test_base.h"

13 #include "ash/test/ash_test_helper.h"	13 #include "ash/test/ash_test_helper.h"

14 #include "ash/test/display_manager_test_api.h"	14 #include "ash/test/display_manager_test_api.h"

15 #include "ash/test/test_user_wallpaper_delegate.h"	15 #include "ash/test/test_user_wallpaper_delegate.h"

16 #include "base/command_line.h"	16 #include "base/command_line.h"

17 #include "base/compiler_specific.h"	17 #include "base/compiler_specific.h"

18 #include "base/file_util.h"	18 #include "base/file_util.h"

19 #include "base/files/file_path.h"	19 #include "base/files/file_path.h"

20 #include "base/macros.h"	20 #include "base/macros.h"

21 #include "base/message_loop/message_loop.h"	21 #include "base/message_loop/message_loop.h"

22 #include "base/path_service.h"	22 #include "base/path_service.h"

23 #include "base/prefs/scoped_user_pref_update.h"	23 #include "base/prefs/scoped_user_pref_update.h"

24 #include "base/strings/string_number_conversions.h"	24 #include "base/strings/string_number_conversions.h"

25 #include "base/time/time.h"	25 #include "base/time/time.h"

26 #include "base/values.h"	26 #include "base/values.h"

27 #include "chrome/browser/chromeos/login/user.h"	27 #include "chrome/browser/chromeos/login/users/user.h"

28 #include "chrome/browser/chromeos/login/user_manager.h"	28 #include "chrome/browser/chromeos/login/users/user_manager.h"

29 #include "chrome/browser/chromeos/login/wallpaper_manager_test_utils.h"	29 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u tils.h"

30 #include "chrome/common/chrome_paths.h"	30 #include "chrome/common/chrome_paths.h"

31 #include "chrome/common/chrome_switches.h"	31 #include "chrome/common/chrome_switches.h"

32 #include "chrome/test/base/in_process_browser_test.h"	32 #include "chrome/test/base/in_process_browser_test.h"

33 #include "chrome/test/base/testing_browser_process.h"	33 #include "chrome/test/base/testing_browser_process.h"

34 #include "chromeos/chromeos_switches.h"	34 #include "chromeos/chromeos_switches.h"

35 #include "content/public/test/test_utils.h"	35 #include "content/public/test/test_utils.h"

36 #include "ui/aura/env.h"	36 #include "ui/aura/env.h"

37 #include "ui/gfx/image/image_skia.h"	37 #include "ui/gfx/image/image_skia.h"

38 #include "ui/gfx/point.h"	38 #include "ui/gfx/point.h"

39 #include "ui/gfx/rect.h"	39 #include "ui/gfx/rect.h"

(...skipping 782 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
822	822

823 WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());	823 WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());

824 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();	824 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();

825	825

826 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(	826 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(

827 controller_->GetWallpaper(),	827 controller_->GetWallpaper(),

828 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));	828 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));

829 }	829 }

830	830

831 } // namespace chromeos	831 } // namespace chromeos

OLD	NEW