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

Unified Diff: chrome/browser/chromeos/events/event_rewriter_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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/events/event_rewriter_unittest.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index f2750f364040a178cab7fa0bb1d3b04a7fdbbab4..9364ca475df6f1ff7fefbac544b7447958467934 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -17,13 +17,13 @@
#include "base/strings/stringprintf.h"
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
#include "chrome/browser/chromeos/input_method/mock_input_method_manager.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/preferences.h"
#include "chrome/common/pref_names.h"
#include "chromeos/chromeos_switches.h"
#include "components/prefs/pref_member.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
-#include "components/user_manager/fake_user_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
@@ -120,7 +120,7 @@ namespace chromeos {
class EventRewriterTest : public ash::test::AshTestBase {
public:
EventRewriterTest()
- : fake_user_manager_(new user_manager::FakeUserManager),
+ : fake_user_manager_(new chromeos::FakeChromeUserManager),
user_manager_enabler_(fake_user_manager_),
input_method_manager_mock_(NULL) {}
~EventRewriterTest() override {}
@@ -152,7 +152,7 @@ class EventRewriterTest : public ash::test::AshTestBase {
return *new_event ? new_event->get()->AsMouseEvent() : &event;
}
- user_manager::FakeUserManager* fake_user_manager_; // Not owned.
+ chromeos::FakeChromeUserManager* fake_user_manager_; // Not owned.
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
chromeos::input_method::MockInputMethodManager* input_method_manager_mock_;
};
@@ -1988,7 +1988,7 @@ class EventRewriterAshTest : public ash::test::AshTestBase {
public:
EventRewriterAshTest()
: source_(&buffer_),
- fake_user_manager_(new user_manager::FakeUserManager),
+ fake_user_manager_(new chromeos::FakeChromeUserManager),
user_manager_enabler_(fake_user_manager_) {}
~EventRewriterAshTest() override {}
@@ -2051,7 +2051,7 @@ class EventRewriterAshTest : public ash::test::AshTestBase {
EventBuffer buffer_;
TestEventSource source_;
- user_manager::FakeUserManager* fake_user_manager_; // Not owned.
+ chromeos::FakeChromeUserManager* fake_user_manager_; // Not owned.
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
sync_preferences::TestingPrefServiceSyncable prefs_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698