| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 ProfileListChromeOSTest() | 57 ProfileListChromeOSTest() |
| 58 : manager_(TestingBrowserProcess::GetGlobal()) { | 58 : manager_(TestingBrowserProcess::GetGlobal()) { |
| 59 } | 59 } |
| 60 | 60 |
| 61 virtual void SetUp() { | 61 virtual void SetUp() { |
| 62 ASSERT_TRUE(manager_.SetUp()); | 62 ASSERT_TRUE(manager_.SetUp()); |
| 63 | 63 |
| 64 // AvatarMenu and multiple profiles works after user logged in. | 64 // AvatarMenu and multiple profiles works after user logged in. |
| 65 manager_.SetLoggedIn(true); | 65 manager_.SetLoggedIn(true); |
| 66 | 66 |
| 67 // We only instantiate UserMenuModel if multi-profile mode is enabled. | |
| 68 CommandLine* cl = CommandLine::ForCurrentProcess(); | |
| 69 cl->AppendSwitch(switches::kMultiProfiles); | |
| 70 | |
| 71 // Initialize the UserManager singleton to a fresh FakeUserManager instance. | 67 // Initialize the UserManager singleton to a fresh FakeUserManager instance. |
| 72 user_manager_enabler_.reset( | 68 user_manager_enabler_.reset( |
| 73 new ScopedUserManagerEnabler(new FakeUserManager)); | 69 new ScopedUserManagerEnabler(new FakeUserManager)); |
| 74 } | 70 } |
| 75 | 71 |
| 76 FakeUserManager* GetFakeUserManager() { | 72 FakeUserManager* GetFakeUserManager() { |
| 77 return static_cast<FakeUserManager*>(UserManager::Get()); | 73 return static_cast<FakeUserManager*>(UserManager::Get()); |
| 78 } | 74 } |
| 79 | 75 |
| 80 void AddProfile(base::string16 name, bool log_in) { | 76 void AddProfile(base::string16 name, bool log_in) { |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 | 312 |
| 317 // Should only show avatar menu with multiple users. | 313 // Should only show avatar menu with multiple users. |
| 318 EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu()); | 314 EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu()); |
| 319 | 315 |
| 320 AddProfile(name2, false); | 316 AddProfile(name2, false); |
| 321 | 317 |
| 322 EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu()); | 318 EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu()); |
| 323 } | 319 } |
| 324 | 320 |
| 325 } // namespace chromeos | 321 } // namespace chromeos |
| OLD | NEW |