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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos_unittest.cc
index d848f8cdd61851122ccbb456b04564bab14dc588..5b7f6ac8f72a9cb96746f93a2257690b5d2148e4 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos_unittest.cc
@@ -11,10 +11,10 @@
#include "chrome/browser/browser_process_platform_part_chromeos.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
#include "chromeos/login/login_state.h"
-#include "components/user_manager/fake_user_manager.h"
#include "media/audio/audio_manager.h"
#include "media/audio/sounds/sounds_manager.h"
@@ -23,7 +23,7 @@ namespace chromeos {
class SystemTrayDelegateChromeOSTest : public ash::test::AshTestBase {
public:
SystemTrayDelegateChromeOSTest()
- : user_manager_enabler_(new user_manager::FakeUserManager) {}
+ : user_manager_enabler_(new chromeos::FakeChromeUserManager) {}
~SystemTrayDelegateChromeOSTest() override {
// The system clock must be destroyed before |settings_helper_|.
g_browser_process->platform_part()->DestroySystemClock();

Powered by Google App Engine
This is Rietveld 408576698