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

Side by Side Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" 5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // http://crbug.com/177918 57 // http://crbug.com/177918
58 TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversBeforeUserLogin) { 58 TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversBeforeUserLogin) {
59 EXPECT_TRUE(LoginUserObserverRegistered()); 59 EXPECT_TRUE(LoginUserObserverRegistered());
60 EXPECT_FALSE(UserActivityObserverRegistered()); 60 EXPECT_FALSE(UserActivityObserverRegistered());
61 } 61 }
62 62
63 // http://crbug.com/177918 63 // http://crbug.com/177918
64 TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversAfterUserLogin) { 64 TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversAfterUserLogin) {
65 content::NotificationService::current()->Notify( 65 content::NotificationService::current()->Notify(
66 chrome::NOTIFICATION_LOGIN_USER_CHANGED, 66 chrome::NOTIFICATION_LOGIN_USER_CHANGED,
67 content::Source<UserManager>(UserManager::Get()), 67 content::Source<UserManager>(GetUserManager()),
68 // Ideally this should be the user logged in, but since we won't really be 68 // Ideally this should be the user logged in, but since we won't really be
69 // checking for the current logged in user in our observer anyway, giving 69 // checking for the current logged in user in our observer anyway, giving
70 // NoDetails here is fine. 70 // NoDetails here is fine.
71 content::NotificationService::NoDetails()); 71 content::NotificationService::NoDetails());
72 72
73 RunAllPendingInMessageLoop(); 73 RunAllPendingInMessageLoop();
74 EXPECT_FALSE(LoginUserObserverRegistered()); 74 EXPECT_FALSE(LoginUserObserverRegistered());
75 EXPECT_TRUE(UserActivityObserverRegistered()); 75 EXPECT_TRUE(UserActivityObserverRegistered());
76 } 76 }
77 77
78 } // namespace chromeos 78 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc ('k') | chrome/browser/chromeos/login/app_launch_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698