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

Side by Side Diff: chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "chrome/browser/chromeos/login/users/user_manager.h" 8 #include "chrome/browser/chromeos/login/users/user_manager.h"
9 #include "chrome/browser/chromeos/profiles/profile_helper.h" 9 #include "chrome/browser/chromeos/profiles/profile_helper.h"
10 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" 10 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 command_line->AppendSwitch(::switches::kIncognito); 107 command_line->AppendSwitch(::switches::kIncognito);
108 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); 108 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
109 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser, 109 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
110 chromeos::UserManager::kGuestUserName); 110 chromeos::UserManager::kGuestUserName);
111 } 111 }
112 112
113 // Verify that no InvalidationService is instantiated for the login profile or 113 // Verify that no InvalidationService is instantiated for the login profile or
114 // the guest profile while a guest session is in progress. 114 // the guest profile while a guest session is in progress.
115 IN_PROC_BROWSER_TEST_F(ProfileInvalidationProviderFactoryGuestBrowserTest, 115 IN_PROC_BROWSER_TEST_F(ProfileInvalidationProviderFactoryGuestBrowserTest,
116 NoInvalidationService) { 116 NoInvalidationService) {
117 chromeos::UserManager* user_manager = chromeos::UserManager::Get(); 117 chromeos::UserManager* user_manager = chromeos::GetUserManager();
118 EXPECT_TRUE(user_manager->IsLoggedInAsGuest()); 118 EXPECT_TRUE(user_manager->IsLoggedInAsGuest());
119 Profile* guest_profile = chromeos::ProfileHelper::Get() 119 Profile* guest_profile = chromeos::ProfileHelper::Get()
120 ->GetProfileByUser(user_manager->GetActiveUser()) 120 ->GetProfileByUser(user_manager->GetActiveUser())
121 ->GetOriginalProfile(); 121 ->GetOriginalProfile();
122 Profile* login_profile = 122 Profile* login_profile =
123 chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile(); 123 chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
124 EXPECT_FALSE(CanConstructProfileInvalidationProvider(guest_profile)); 124 EXPECT_FALSE(CanConstructProfileInvalidationProvider(guest_profile));
125 EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile)); 125 EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile));
126 } 126 }
127 127
128 } // namespace invalidation 128 } // namespace invalidation
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698