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/wallpaper_manager_unittest.cc

Issue 156703006: Cleanup: Remove unneeded browser_thread.h includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 10 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <cstdlib> 5 #include <cstdlib>
6 #include <cstring> 6 #include <cstring>
7 7
8 #include "ash/ash_resources/grit/ash_resources.h" 8 #include "ash/ash_resources/grit/ash_resources.h"
9 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/prefs/pref_service.h" 15 #include "base/prefs/pref_service.h"
16 #include "base/prefs/testing_pref_service.h" 16 #include "base/prefs/testing_pref_service.h"
17 #include "chrome/browser/chromeos/login/startup_utils.h" 17 #include "chrome/browser/chromeos/login/startup_utils.h"
18 #include "chrome/browser/chromeos/login/user_manager.h" 18 #include "chrome/browser/chromeos/login/user_manager.h"
19 #include "chrome/browser/chromeos/login/user_manager_impl.h" 19 #include "chrome/browser/chromeos/login/user_manager_impl.h"
20 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 20 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
21 #include "chrome/browser/chromeos/settings/cros_settings.h" 21 #include "chrome/browser/chromeos/settings/cros_settings.h"
22 #include "chrome/browser/chromeos/settings/device_settings_service.h" 22 #include "chrome/browser/chromeos/settings/device_settings_service.h"
23 #include "chrome/test/base/testing_browser_process.h" 23 #include "chrome/test/base/testing_browser_process.h"
24 #include "chromeos/chromeos_switches.h" 24 #include "chromeos/chromeos_switches.h"
25 #include "chromeos/settings/cros_settings_names.h" 25 #include "chromeos/settings/cros_settings_names.h"
26 #include "chromeos/settings/cros_settings_provider.h" 26 #include "chromeos/settings/cros_settings_provider.h"
27 #include "content/public/test/test_browser_thread.h"
28 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
29 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
30 29
31 using namespace ash; 30 using namespace ash;
32 31
33 const char kTestUser1[] = "test-user@example.com"; 32 const char kTestUser1[] = "test-user@example.com";
34 const char kTestUser1Hash[] = "test-user@example.com-hash"; 33 const char kTestUser1Hash[] = "test-user@example.com-hash";
35 34
36 namespace chromeos { 35 namespace chromeos {
37 36
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 WallpaperManager::Get()->InitializeWallpaper(); 125 WallpaperManager::Get()->InitializeWallpaper();
127 EXPECT_TRUE(test_api->current_wallpaper_path().empty()); 126 EXPECT_TRUE(test_api->current_wallpaper_path().empty());
128 UserManager::Get()->UserLoggedIn(UserManager::kGuestUserName, 127 UserManager::Get()->UserLoggedIn(UserManager::kGuestUserName,
129 UserManager::kGuestUserName, false); 128 UserManager::kGuestUserName, false);
130 WaitAsyncWallpaperLoad(); 129 WaitAsyncWallpaperLoad();
131 EXPECT_FALSE(ash::Shell::GetInstance()->desktop_background_controller()-> 130 EXPECT_FALSE(ash::Shell::GetInstance()->desktop_background_controller()->
132 SetDefaultWallpaper(true)); 131 SetDefaultWallpaper(true));
133 } 132 }
134 133
135 } // namespace chromeos 134 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698