[Reland] GetAccountIdFromProfile() should not return an empty account id if a valid profile is prov…

chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc

Index: chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
index 3c13430f8ac69200c303aa33c9b99f449062f294..8f49280c81523b0d359983e1d8da37d10bfafd42 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
@@ -10,11 +10,13 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.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/common/chrome_switches.h"
 #include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/ui_base_types.h"
 
@@ -24,7 +26,10 @@ namespace test {
 // A test class for preparing the chrome::MultiUserContextMenu.
 class MultiUserContextMenuChromeOSTest : public AshTestBase {
  public:
-  MultiUserContextMenuChromeOSTest() : multi_user_window_manager_(NULL) {}
+  MultiUserContextMenuChromeOSTest()
+      : multi_user_window_manager_(NULL),
+        fake_user_manager_(new user_manager::FakeUserManager),
+        user_manager_enabler_(fake_user_manager_) {}
 
   void SetUp() override;
   void TearDown() override;
@@ -51,6 +56,8 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase {
 
   // The instance of the MultiUserWindowManager.
   chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
+  user_manager::FakeUserManager* fake_user_manager_;  // Not owned.
+  chromeos::ScopedUserManagerEnabler user_manager_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiUserContextMenuChromeOSTest);
 };