MD Settings: People: Show correct user name

chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/profile_info_handler.h"
 
 #include <memory>
 
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_web_ui.h"
 #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"
 #endif
 
 namespace settings {
 
 namespace {
 
+#if defined(OS_CHROMEOS)
+constexpr char fake_id[] = "fake_id";
+constexpr char fake_email[] = "fake_id@gmail.com";
+#endif
+
 class TestProfileInfoHandler : public ProfileInfoHandler {
  public:
   explicit TestProfileInfoHandler(Profile* profile)
       : ProfileInfoHandler(profile) {}
 
   using ProfileInfoHandler::set_web_ui;
 };
 
 }  // namespace
 
 class ProfileInfoHandlerTest : public testing::Test {
  public:
   ProfileInfoHandlerTest()
       : profile_manager_(TestingBrowserProcess::GetGlobal()),
-#if defined(OS_CHROMEOS)
-        user_manager_enabler_(new chromeos::FakeChromeUserManager),
-#endif
-        profile_(nullptr) {
-  }
+        profile_(nullptr) {}
 
   void SetUp() override {
     ASSERT_TRUE(profile_manager_.SetUp());
 
 #if defined(OS_CHROMEOS)
-    profile_ = profile_manager_.CreateTestingProfile("fake_id@gmail.com");
+    chromeos::FakeChromeUserManager* fake_user_manager =
+        new chromeos::FakeChromeUserManager;
+    user_manager_enabler_.reset(
+        new chromeos::ScopedUserManagerEnabler(fake_user_manager));
+    profile_ = profile_manager_.CreateTestingProfile(fake_email);
+    fake_user_manager->AddUser(AccountId::FromUserEmail(fake_email));
 #else
     profile_ = profile_manager_.CreateTestingProfile("Profile 1");
 #endif
 
     handler_.reset(new TestProfileInfoHandler(profile_));
     handler_->set_web_ui(&web_ui_);
   }
 
   void VerifyProfileInfo(const base::Value* call_argument) {
     const base::DictionaryValue* response = nullptr;
     ASSERT_TRUE(call_argument->GetAsDictionary(&response));
 
     std::string name;
     std::string icon_url;
     ASSERT_TRUE(response->GetString("name", &name));
     ASSERT_TRUE(response->GetString("iconUrl", &icon_url));
 
 #if defined(OS_CHROMEOS)
-    EXPECT_EQ("fake_id@gmail.com", name);
+    EXPECT_EQ(fake_id, name);
     EXPECT_FALSE(icon_url.empty());
 #else
     EXPECT_EQ("Profile 1", name);
     EXPECT_EQ("chrome://theme/IDR_PROFILE_AVATAR_0", icon_url);
 #endif
   }
 
   content::TestWebUI* web_ui() { return &web_ui_; }
   Profile* profile() const { return profile_; }
   TestProfileInfoHandler* handler() const { return handler_.get(); }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfileManager profile_manager_;
   content::TestWebUI web_ui_;
 
 #if defined(OS_CHROMEOS)
-  chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+  std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
 #endif
 
   Profile* profile_;
   std::unique_ptr<TestProfileInfoHandler> handler_;
 };
 
 TEST_F(ProfileInfoHandlerTest, GetProfileInfo) {
   base::ListValue list_args;
   list_args.AppendString("get-profile-info-callback-id");
   handler()->HandleGetProfileInfo(&list_args);
@@ skipping 74 matching lines @@
   ASSERT_TRUE(data.arg1()->GetAsString(&event_id));
   EXPECT_EQ(ProfileInfoHandler::kProfileManagesSupervisedUsersChangedEventName,
             event_id);
 
   bool has_supervised_users = false;
   ASSERT_TRUE(data.arg2()->GetAsBoolean(&has_supervised_users));
   EXPECT_TRUE(has_supervised_users);
 }
 
 }  // namespace settings