| 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_TEST_UTI
LS_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_TEST_UTI
LS_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_TEST_UTI
LS_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_TEST_UTI
LS_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 | 60 |
| 61 // Wait until all wallpaper loading is done, and WallpaperManager comes into | 61 // Wait until all wallpaper loading is done, and WallpaperManager comes into |
| 62 // a stable state. | 62 // a stable state. |
| 63 void WaitAsyncWallpaperLoadFinished(); | 63 void WaitAsyncWallpaperLoadFinished(); |
| 64 | 64 |
| 65 // Initializes default wallpaper paths "*default_*file" and writes JPEG | 65 // Initializes default wallpaper paths "*default_*file" and writes JPEG |
| 66 // wallpaper images to them. | 66 // wallpaper images to them. |
| 67 // Only needs to be called (once) by tests that want to test loading of | 67 // Only needs to be called (once) by tests that want to test loading of |
| 68 // default wallpapers. | 68 // default wallpapers. |
| 69 void CreateCmdlineWallpapers(const base::ScopedTempDir& dir, | 69 void CreateCmdlineWallpapers(const base::ScopedTempDir& dir, |
| 70 scoped_ptr<base::CommandLine>* command_line); | 70 std::unique_ptr<base::CommandLine>* command_line); |
| 71 | 71 |
| 72 } // namespace wallpaper_manager_test_utils | 72 } // namespace wallpaper_manager_test_utils |
| 73 } // namespace chromeos | 73 } // namespace chromeos |
| 74 | 74 |
| 75 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_TEST_
UTILS_H_ | 75 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_TEST_
UTILS_H_ |
| OLD | NEW |