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

Side by Side Diff: chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // Initialize the UserManager singleton to a fresh FakeUserManager instance. 67 // Initialize the UserManager singleton to a fresh FakeUserManager instance.
68 user_manager_enabler_.reset( 68 user_manager_enabler_.reset(
69 new ScopedUserManagerEnabler(new FakeUserManager)); 69 new ScopedUserManagerEnabler(new FakeUserManager));
70 } 70 }
71 71
72 FakeUserManager* GetFakeUserManager() { 72 FakeUserManager* GetFakeUserManager() {
73 return static_cast<FakeUserManager*>(UserManager::Get()); 73 return static_cast<FakeUserManager*>(GetUserManager());
74 } 74 }
75 75
76 void AddProfile(base::string16 name, bool log_in) { 76 void AddProfile(base::string16 name, bool log_in) {
77 std::string email_string = base::UTF16ToASCII(name) + "@example.com"; 77 std::string email_string = base::UTF16ToASCII(name) + "@example.com";
78 78
79 // Add a user to the fake user manager. 79 // Add a user to the fake user manager.
80 GetFakeUserManager()->AddUser(email_string); 80 GetFakeUserManager()->AddUser(email_string);
81 if (log_in) { 81 if (log_in) {
82 GetFakeUserManager()->UserLoggedIn( 82 GetFakeUserManager()->UserLoggedIn(
83 email_string, 83 email_string,
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 311
312 // Should only show avatar menu with multiple users. 312 // Should only show avatar menu with multiple users.
313 EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu()); 313 EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
314 314
315 AddProfile(name2, false); 315 AddProfile(name2, false);
316 316
317 EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu()); 317 EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
318 } 318 }
319 319
320 } // namespace chromeos 320 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/profiles/profile_list_chromeos.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698