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

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

Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mash browser test crash in GetMaxDisplaySizeInNative. Created 4 years, 4 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 <cstdlib> 7 #include <cstdlib>
8 #include <cstring> 8 #include <cstring>
9 #include <memory> 9 #include <memory>
10 10
11 #include "ash/desktop_background/desktop_background_controller.h"
12 #include "ash/desktop_background/desktop_background_controller_observer.h"
13 #include "ash/shell.h" 11 #include "ash/shell.h"
14 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
15 #include "ash/test/display_manager_test_api.h" 13 #include "ash/test/display_manager_test_api.h"
16 #include "ash/test/test_user_wallpaper_delegate.h"
17 #include "base/command_line.h" 14 #include "base/command_line.h"
18 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
19 #include "base/files/file_util.h" 16 #include "base/files/file_util.h"
20 #include "base/files/scoped_temp_dir.h" 17 #include "base/files/scoped_temp_dir.h"
21 #include "chrome/browser/chromeos/login/startup_utils.h" 18 #include "chrome/browser/chromeos/login/startup_utils.h"
22 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" 19 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
23 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 20 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
24 #include "chrome/browser/chromeos/settings/cros_settings.h" 21 #include "chrome/browser/chromeos/settings/cros_settings.h"
25 #include "chrome/browser/chromeos/settings/device_settings_service.h" 22 #include "chrome/browser/chromeos/settings/device_settings_service.h"
26 #include "chrome/browser/prefs/browser_prefs.h" 23 #include "chrome/browser/prefs/browser_prefs.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 fake_user_manager()->RemoveUserFromList(test_account_id_2); 149 fake_user_manager()->RemoveUserFromList(test_account_id_2);
153 150
154 // Test that only user1's wallpaper can be found in cache. 151 // Test that only user1's wallpaper can be found in cache.
155 EXPECT_TRUE( 152 EXPECT_TRUE(
156 test_api->GetWallpaperFromCache(test_account_id_1, &cached_wallpaper)); 153 test_api->GetWallpaperFromCache(test_account_id_1, &cached_wallpaper));
157 EXPECT_FALSE( 154 EXPECT_FALSE(
158 test_api->GetWallpaperFromCache(test_account_id_2, &cached_wallpaper)); 155 test_api->GetWallpaperFromCache(test_account_id_2, &cached_wallpaper));
159 } 156 }
160 157
161 } // namespace chromeos 158 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698