| 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" |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 | 164 |
| 165 // LoginManagerTest: | 165 // LoginManagerTest: |
| 166 virtual void SetUpInProcessBrowserTestFixture() override { | 166 virtual void SetUpInProcessBrowserTestFixture() override { |
| 167 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( | 167 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
| 168 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); | 168 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); |
| 169 | 169 |
| 170 LoginManagerTest::SetUpInProcessBrowserTestFixture(); | 170 LoginManagerTest::SetUpInProcessBrowserTestFixture(); |
| 171 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_)); | 171 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_)); |
| 172 } | 172 } |
| 173 | 173 |
| 174 virtual void SetUpCommandLine(CommandLine* command_line) override { | 174 virtual void SetUpCommandLine(base::CommandLine* command_line) override { |
| 175 // Set the same switches as LoginManagerTest, except that kMultiProfiles is | 175 // Set the same switches as LoginManagerTest, except that kMultiProfiles is |
| 176 // only set when GetParam() is true and except that kLoginProfile is set | 176 // only set when GetParam() is true and except that kLoginProfile is set |
| 177 // when GetParam() is false. The latter seems to be required for the sane | 177 // when GetParam() is false. The latter seems to be required for the sane |
| 178 // start-up of user profiles. | 178 // start-up of user profiles. |
| 179 command_line->AppendSwitch(switches::kLoginManager); | 179 command_line->AppendSwitch(switches::kLoginManager); |
| 180 command_line->AppendSwitch(switches::kForceLoginManagerInTests); | 180 command_line->AppendSwitch(switches::kForceLoginManagerInTests); |
| 181 } | 181 } |
| 182 | 182 |
| 183 virtual void SetUpOnMainThread() override { | 183 virtual void SetUpOnMainThread() override { |
| 184 LoginManagerTest::SetUpOnMainThread(); | 184 LoginManagerTest::SetUpOnMainThread(); |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 | 396 |
| 397 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PersistOverLogout) { | 397 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PersistOverLogout) { |
| 398 LoginUser(kTestUsers[0]); | 398 LoginUser(kTestUsers[0]); |
| 399 | 399 |
| 400 // Wait until wallpaper has been loaded. | 400 // Wait until wallpaper has been loaded. |
| 401 RunUntilWallpaperChangeCount(1); | 401 RunUntilWallpaperChangeCount(1); |
| 402 ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor()); | 402 ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor()); |
| 403 } | 403 } |
| 404 | 404 |
| 405 } // namespace chromeos | 405 } // namespace chromeos |
| OLD | NEW |