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

Unified Diff: chrome/browser/ui/browser_finder_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/browser_finder_chromeos_unittest.cc
diff --git a/chrome/browser/ui/browser_finder_chromeos_unittest.cc b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
index 93525ef42865b5450133aaffbc610a6ddea02a11..c9802e2b1e1d1a8f3b7f87cf1459fd03b2e016ea 100644
--- a/chrome/browser/ui/browser_finder_chromeos_unittest.cc
+++ b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
@@ -8,6 +8,7 @@
#include "ash/shell.h"
#include "ash/test/ash_test_helper.h"
#include "base/macros.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/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -18,7 +19,6 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/signin/core/account_id/account_id.h"
-#include "components/user_manager/fake_user_manager.h"
#include "components/user_manager/user.h"
namespace test {
@@ -34,7 +34,7 @@ class BrowserFinderChromeOSTest : public BrowserWithTestWindowTest {
protected:
BrowserFinderChromeOSTest()
: multi_user_window_manager_(nullptr),
- fake_user_manager_(new user_manager::FakeUserManager),
+ fake_user_manager_(new chromeos::FakeChromeUserManager),
user_manager_enabler_(fake_user_manager_) {}
TestingProfile* CreateMultiUserProfile(const AccountId& account_id) {
@@ -100,7 +100,9 @@ class BrowserFinderChromeOSTest : public BrowserWithTestWindowTest {
TestingProfile* second_profile_;
std::unique_ptr<TestingProfileManager> profile_manager_;
chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
- user_manager::FakeUserManager* fake_user_manager_; // Not owned.
+
+ // |fake_user_manager_| is owned by |user_manager_enabler_|
+ chromeos::FakeChromeUserManager* fake_user_manager_;
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(BrowserFinderChromeOSTest);

Powered by Google App Engine
This is Rietveld 408576698