chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 824683002: UserManager stack refactoring.

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Split for FakeManager complete. Created 5 years, 11 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

« chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc ('K') | « chrome/browser/profiles/profile_manager_unittest.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc » ('j') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

index b4674b395b6ee3ab2fdab39f46a5aa19c38375f6..8c8c70bfa4ccefe4828a63734e249206aef7018b 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -39,6 +39,7 @@

#include "chrome/test/base/browser_with_test_window_test.h"

#include "chrome/test/base/testing_pref_service_syncable.h"

#include "chrome/test/base/testing_profile.h"

+#include "components/user_manager/fake_user_manager.h"

#include "content/public/browser/web_contents.h"

#include "extensions/common/extension.h"

#include "extensions/common/manifest_constants.h"

@@ -50,7 +51,7 @@

#include "ash/test/test_session_state_delegate.h"

#include "ash/test/test_shell_delegate.h"

#include "chrome/browser/apps/scoped_keep_alive.h"

-#include "chrome/browser/chromeos/login/users/fake_user_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/ui/apps/chrome_app_delegate.h"

#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"

@@ -782,8 +783,13 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest

profile_manager_->SetLoggedIn(true);

// Initialize the UserManager singleton to a fresh FakeUserManager instance.

- user_manager_enabler_.reset(

- new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));

+#if defined(OS_CHROMEOS)

+ user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(

+ new chromeos::FakeChromeUserManager));

+#else // !defined(OS_CHROMEOS)

+ user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(

Nikita (slow) 2015/01/20 18:18:22 It looks like this whole block is under #if defin

merkulova 2015/01/21 14:10:34 Done.

+ new user_manager::FakeUserManager));

+#endif // defined(OS_CHROMEOS)

// Initialize the rest.

ChromeLauncherControllerTest::SetUp();

@@ -909,8 +915,8 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest

typedef std::map<Profile*, std::string> ProfileToNameMap;

TestingProfileManager* profile_manager() { return profile_manager_.get(); }

- chromeos::FakeUserManager* GetFakeUserManager() {

- return static_cast<chromeos::FakeUserManager*>(

+ chromeos::FakeChromeUserManager* GetFakeUserManager() {

+ return static_cast<chromeos::FakeChromeUserManager*>(

user_manager::UserManager::Get());

}