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

Unified Diff: chrome/browser/chromeos/events/event_rewriter_unittest.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fixed. Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/chromeos/extensions/wallpaper_private_api_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 7eaa7b0c501965e4b92aecea753cb98bd91ba347..aed81d1781b2a7d8ff909a8eec6b751d2d3be7e9 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -17,12 +17,12 @@
#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_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 "chrome/test/base/testing_pref_service_syncable.h"
#include "chromeos/chromeos_switches.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"
@@ -222,7 +222,7 @@ namespace chromeos {
class EventRewriterTest : public ash::test::AshTestBase {
public:
EventRewriterTest()
- : fake_user_manager_(new chromeos::FakeUserManager),
+ : fake_user_manager_(new user_manager::FakeUserManager),
user_manager_enabler_(fake_user_manager_),
input_method_manager_mock_(NULL) {}
~EventRewriterTest() override {}
@@ -255,7 +255,7 @@ class EventRewriterTest : public ash::test::AshTestBase {
: &event;
}
- chromeos::FakeUserManager* fake_user_manager_; // Not owned.
+ user_manager::FakeUserManager* fake_user_manager_; // Not owned.
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
chromeos::input_method::MockInputMethodManager* input_method_manager_mock_;
};
@@ -1821,7 +1821,7 @@ class EventRewriterAshTest : public ash::test::AshTestBase {
public:
EventRewriterAshTest()
: source_(&buffer_),
- fake_user_manager_(new chromeos::FakeUserManager),
+ fake_user_manager_(new user_manager::FakeUserManager),
user_manager_enabler_(fake_user_manager_) {}
~EventRewriterAshTest() override {}
@@ -1880,7 +1880,7 @@ class EventRewriterAshTest : public ash::test::AshTestBase {
EventBuffer buffer_;
TestEventSource source_;
- chromeos::FakeUserManager* fake_user_manager_; // Not owned.
+ user_manager::FakeUserManager* fake_user_manager_; // Not owned.
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
TestingPrefServiceSyncable prefs_;
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698