OLD | NEW |
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 <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "ash/desktop_background/desktop_background_controller.h" | 8 #include "ash/desktop_background/desktop_background_controller.h" |
9 #include "ash/desktop_background/desktop_background_controller_observer.h" | 9 #include "ash/desktop_background/desktop_background_controller_observer.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.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/file_util.h" | 14 #include "base/file_util.h" |
15 #include "base/files/file_path.h" | 15 #include "base/files/file_path.h" |
16 #include "base/json/json_writer.h" | 16 #include "base/json/json_writer.h" |
17 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.h" |
18 #include "base/path_service.h" | 18 #include "base/path_service.h" |
19 #include "base/run_loop.h" | 19 #include "base/run_loop.h" |
20 #include "chrome/browser/chromeos/login/login_display_host_impl.h" | |
21 #include "chrome/browser/chromeos/login/login_manager_test.h" | 20 #include "chrome/browser/chromeos/login/login_manager_test.h" |
22 #include "chrome/browser/chromeos/login/startup_utils.h" | 21 #include "chrome/browser/chromeos/login/startup_utils.h" |
23 #include "chrome/browser/chromeos/login/user.h" | 22 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
24 #include "chrome/browser/chromeos/login/user_manager.h" | 23 #include "chrome/browser/chromeos/login/users/user.h" |
25 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 24 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 25 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
26 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u
til.h" | 26 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u
til.h" |
27 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" | 27 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
28 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom
eos.h" | 28 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom
eos.h" |
29 #include "chrome/browser/profiles/profile.h" | 29 #include "chrome/browser/profiles/profile.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 "chromeos/chromeos_paths.h" | 32 #include "chromeos/chromeos_paths.h" |
33 #include "chromeos/chromeos_switches.h" | 33 #include "chromeos/chromeos_switches.h" |
34 #include "chromeos/dbus/cryptohome_client.h" | 34 #include "chromeos/dbus/cryptohome_client.h" |
35 #include "chromeos/dbus/dbus_thread_manager.h" | 35 #include "chromeos/dbus/dbus_thread_manager.h" |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 | 403 |
404 // Wait until wallpaper has been loaded. | 404 // Wait until wallpaper has been loaded. |
405 RunUntilWallpaperChangeCount(1); | 405 RunUntilWallpaperChangeCount(1); |
406 ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor()); | 406 ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor()); |
407 } | 407 } |
408 | 408 |
409 INSTANTIATE_TEST_CASE_P(WallpaperManagerPolicyTestInstantiation, | 409 INSTANTIATE_TEST_CASE_P(WallpaperManagerPolicyTestInstantiation, |
410 WallpaperManagerPolicyTest, testing::Bool()); | 410 WallpaperManagerPolicyTest, testing::Bool()); |
411 | 411 |
412 } // namespace chromeos | 412 } // namespace chromeos |
OLD | NEW |