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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos_unittest.cc

Issue 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager (Closed)
Patch Set: Addressed comment Created 4 years, 1 month 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/ui/ash/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/browser_process_platform_part_chromeos.h" 11 #include "chrome/browser/browser_process_platform_part_chromeos.h"
12 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 12 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
13 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 13 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
14 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
14 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 15 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
15 #include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h" 16 #include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
16 #include "chromeos/login/login_state.h" 17 #include "chromeos/login/login_state.h"
17 #include "components/user_manager/fake_user_manager.h"
18 #include "media/audio/audio_manager.h" 18 #include "media/audio/audio_manager.h"
19 #include "media/audio/sounds/sounds_manager.h" 19 #include "media/audio/sounds/sounds_manager.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 class SystemTrayDelegateChromeOSTest : public ash::test::AshTestBase { 23 class SystemTrayDelegateChromeOSTest : public ash::test::AshTestBase {
24 public: 24 public:
25 SystemTrayDelegateChromeOSTest() 25 SystemTrayDelegateChromeOSTest()
26 : user_manager_enabler_(new user_manager::FakeUserManager) {} 26 : user_manager_enabler_(new chromeos::FakeChromeUserManager) {}
27 ~SystemTrayDelegateChromeOSTest() override { 27 ~SystemTrayDelegateChromeOSTest() override {
28 // The system clock must be destroyed before |settings_helper_|. 28 // The system clock must be destroyed before |settings_helper_|.
29 g_browser_process->platform_part()->DestroySystemClock(); 29 g_browser_process->platform_part()->DestroySystemClock();
30 } 30 }
31 31
32 void SetUp() override { 32 void SetUp() override {
33 input_method::Initialize(); 33 input_method::Initialize();
34 ash::test::AshTestBase::SetUp(); 34 ash::test::AshTestBase::SetUp();
35 audio_manager_ = media::AudioManager::CreateForTesting( 35 audio_manager_ = media::AudioManager::CreateForTesting(
36 base::ThreadTaskRunnerHandle::Get()); 36 base::ThreadTaskRunnerHandle::Get());
(...skipping 21 matching lines...) Expand all
58 // This test is times out flakily: http://crbug.com/639938 58 // This test is times out flakily: http://crbug.com/639938
59 // Test that checking bluetooth status early on does not cause a crash. 59 // Test that checking bluetooth status early on does not cause a crash.
60 TEST_F(SystemTrayDelegateChromeOSTest, DISABLED_BluetoothStatus) { 60 TEST_F(SystemTrayDelegateChromeOSTest, DISABLED_BluetoothStatus) {
61 SystemTrayDelegateChromeOS delegate; 61 SystemTrayDelegateChromeOS delegate;
62 EXPECT_FALSE(delegate.GetBluetoothAvailable()); 62 EXPECT_FALSE(delegate.GetBluetoothAvailable());
63 EXPECT_FALSE(delegate.GetBluetoothEnabled()); 63 EXPECT_FALSE(delegate.GetBluetoothEnabled());
64 EXPECT_FALSE(delegate.IsBluetoothDiscovering()); 64 EXPECT_FALSE(delegate.IsBluetoothDiscovering());
65 } 65 }
66 66
67 } // namespace chromeos 67 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698