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 "ash/shell.h" | 5 #include "ash/shell.h" |
6 #include "ash/system/system_notifier.h" | 6 #include "ash/system/system_notifier.h" |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" |
8 #include "chrome/browser/chromeos/login/login_manager_test.h" | 9 #include "chrome/browser/chromeos/login/login_manager_test.h" |
9 #include "chrome/browser/chromeos/login/startup_utils.h" | 10 #include "chrome/browser/chromeos/login/startup_utils.h" |
10 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 11 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
11 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos
.h" | 12 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos
.h" |
12 #include "content/public/test/test_utils.h" | 13 #include "content/public/test/test_utils.h" |
13 #include "ui/message_center/message_center.h" | 14 #include "ui/message_center/message_center.h" |
14 | 15 |
15 using namespace testing; | 16 using namespace testing; |
16 | 17 |
17 namespace { | 18 namespace { |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 content::RunAllPendingInMessageLoop(); | 131 content::RunAllPendingInMessageLoop(); |
131 EXPECT_EQ(1, GetStateChangedCountAndReset()); | 132 EXPECT_EQ(1, GetStateChangedCountAndReset()); |
132 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id)); | 133 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id)); |
133 | 134 |
134 // Multi-login user switch off. | 135 // Multi-login user switch off. |
135 chromeos::UserAddingScreen::Get()->Cancel(); | 136 chromeos::UserAddingScreen::Get()->Cancel(); |
136 content::RunAllPendingInMessageLoop(); | 137 content::RunAllPendingInMessageLoop(); |
137 EXPECT_EQ(1, GetStateChangedCountAndReset()); | 138 EXPECT_EQ(1, GetStateChangedCountAndReset()); |
138 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id)); | 139 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id)); |
139 } | 140 } |
OLD | NEW |