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

Unified Diff: chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc

Issue 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager (Closed)
Patch Set: Addressed comments 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/webui/settings/profile_info_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc b/chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc
index b2787b3e0ccd79ec41060affa5e0345f2b815f33..7bdfd81e50c5db4985dcb619f7b4df7f6a90fe97 100644
--- a/chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc
@@ -17,8 +17,8 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
-#include "components/user_manager/fake_user_manager.h"
#endif
namespace settings {
@@ -40,7 +40,7 @@ class ProfileInfoHandlerTest : public testing::Test {
ProfileInfoHandlerTest()
: profile_manager_(TestingBrowserProcess::GetGlobal()),
#if defined(OS_CHROMEOS)
- user_manager_(new user_manager::FakeUserManager),
+ user_manager_(new chromeos::FakeChromeUserManager),
user_manager_enabler_(user_manager_),
#endif
profile_(nullptr) {
@@ -88,7 +88,7 @@ class ProfileInfoHandlerTest : public testing::Test {
#if defined(OS_CHROMEOS)
// |user_manager_| is destroyed by |user_manager_enabler_|.
msw 2016/11/17 18:31:22 ditto nit: this comment is sufficient, but the |us
yoshiki 2016/11/18 15:54:15 Done.
- user_manager::FakeUserManager* user_manager_;
+ chromeos::FakeChromeUserManager* user_manager_;
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
#endif

Powered by Google App Engine
This is Rietveld 408576698