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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

Issue 952853002: Wallpaper manager now observing user child user status to update default wallpaper. (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
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index badf4a535b2e1428ed168b9200ba445ded033a37..e6834781b0367656be121bf13fcbd53ef8f5b36f 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -18,10 +18,12 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
+#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
#include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/user_manager/fake_user_manager.h"
#include "components/user_manager/user_info.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -39,7 +41,9 @@ class MultiUserWindowManagerChromeOSTest : public AshTestBase {
public:
MultiUserWindowManagerChromeOSTest()
: multi_user_window_manager_(NULL),
- session_state_delegate_(NULL) {}
+ session_state_delegate_(NULL),
+ fake_user_manager_(new user_manager::FakeUserManager),
+ user_manager_enabler_(fake_user_manager_) {}
void SetUp() override;
void TearDown() override;
@@ -158,6 +162,10 @@ class MultiUserWindowManagerChromeOSTest : public AshTestBase {
// The session state delegate.
ash::test::TestSessionStateDelegate* session_state_delegate_;
+ user_manager::FakeUserManager* fake_user_manager_; // Not owned.
+
+ chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+
// The maximized window manager (if enabled).
scoped_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;

Powered by Google App Engine
This is Rietveld 408576698