ProfileManager doesn't depend on "--login-profile" switch.

chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/avatar_menu_observer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 namespace {
 
-// As defined in /chromeos/dbus/cryptohome_client.cc.
-static const char kUserIdHashSuffix[] = "-hash";
-
 class MockObserver : public AvatarMenuObserver {
  public:
   MockObserver() : count_(0) {}
   virtual ~MockObserver() {}
 
   virtual void OnAvatarMenuChanged(
       AvatarMenu* avatar_menu) OVERRIDE {
     ++count_;
   }
 
@@ skipping 29 matching lines @@
   FakeUserManager* GetFakeUserManager() {
     return static_cast<FakeUserManager*>(user_manager::UserManager::Get());
   }
 
   void AddProfile(base::string16 name, bool log_in) {
     std::string email_string = base::UTF16ToASCII(name) + "@example.com";
 
     // Add a user to the fake user manager.
     GetFakeUserManager()->AddUser(email_string);
     if (log_in) {
-      GetFakeUserManager()->UserLoggedIn(
-          email_string,
-          email_string + kUserIdHashSuffix,
-          false);
+      GetFakeUserManager()->LoginUser(email_string);
     }

[Nikita (slow), 2014/08/19 11:09:48]

nit: drop {}

[dzhioev (left Google), 2014/08/20 20:21:36]

Done.

 
     // Create a profile for the user.
-    manager()->CreateTestingProfile(
-        chrome::kProfileDirPrefix + email_string + kUserIdHashSuffix,
-        scoped_ptr<PrefServiceSyncable>(),
-        ASCIIToUTF16(email_string), 0, std::string(),
-        TestingProfile::TestingFactories());
+    manager()->CreateTestingProfile(email_string);
   }
 
   AvatarMenu* GetAvatarMenu() {
     // Reset the MockObserver.
     mock_observer_.reset(new MockObserver());
     EXPECT_EQ(0, change_count());
 
     // Reset the menu.
     avatar_menu_.reset(new AvatarMenu(
         manager()->profile_info_cache(),
         mock_observer_.get(),
         NULL));
     avatar_menu_->RebuildMenu();
     EXPECT_EQ(0, change_count());
     return avatar_menu_.get();
   }
 
-  void ActiveUserChanged(ProfileHelper* profile_helper,
-                         const std::string& hash) {
-    profile_helper->ActiveUserHashChanged(hash);
+  void ActiveUserChanged(const base::string16& name) {
+    std::string email_string = base::UTF16ToASCII(name) + "@example.com";
+    GetFakeUserManager()->SwitchActiveUser(email_string);
   }
 
   TestingProfileManager* manager() { return &manager_; }
 
   int change_count() const { return mock_observer_->change_count(); }
 
  private:
   TestingProfileManager manager_;
   scoped_ptr<MockObserver> mock_observer_;
   scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
@@ skipping 89 matching lines @@
   EXPECT_FALSE(menu->ShouldShowAddNewProfileLink());
 }
 
 TEST_F(ProfileListChromeOSTest, ActiveItem) {
   base::string16 name1(ASCIIToUTF16("p1.com"));
   base::string16 name2(ASCIIToUTF16("p2.com"));
 
   AddProfile(name1, true);
   AddProfile(name2, true);
 
-  // Initialize ProfileHelper, it will be accessed from GetActiveProfileIndex.
-  std::string email_string = base::UTF16ToASCII(name1) + "@example.com";
-  std::string hash = email_string + kUserIdHashSuffix;
-  ActiveUserChanged(ProfileHelper::Get(), hash);
+  ActiveUserChanged(name1);
 
   AvatarMenu* menu = GetAvatarMenu();
 
   ASSERT_EQ(2U, menu->GetNumberOfItems());
   // TODO(jeremy): Expand test to verify active profile index other than 0
   // crbug.com/100871
   ASSERT_EQ(0U, menu->GetActiveProfileIndex());
 }
 
 TEST_F(ProfileListChromeOSTest, ModifyingNameResortsCorrectly) {
@@ skipping 74 matching lines @@
 
   // Should only show avatar menu with multiple users.
   EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
 
   AddProfile(name2, false);
 
   EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
 }
 
 }  // namespace chromeos