| 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 "chrome/browser/chromeos/login/login_manager_test.h" | 8 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 9 #include "chrome/browser/chromeos/login/startup_utils.h" | 9 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 10 #include "chrome/browser/chromeos/login/user_adding_screen.h" | 10 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
| 11 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos
.h" | 11 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos
.h" |
| 12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 #include "content/public/test/test_utils.h" | 13 #include "content/public/test/test_utils.h" |
| 14 #include "ui/message_center/message_center.h" | 14 #include "ui/message_center/message_center.h" |
| 15 | 15 |
| 16 using namespace testing; | 16 using namespace testing; |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 const char* kTestUsers[] = {"test-user@gmail.com", | 20 const char* kTestUsers[] = {"test-user@gmail.com", |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 content::RunAllPendingInMessageLoop(); | 138 content::RunAllPendingInMessageLoop(); |
| 139 EXPECT_EQ(1, GetStateChangedCountAndReset()); | 139 EXPECT_EQ(1, GetStateChangedCountAndReset()); |
| 140 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id)); | 140 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id)); |
| 141 | 141 |
| 142 // Multi-login user switch off. | 142 // Multi-login user switch off. |
| 143 chromeos::UserAddingScreen::Get()->Cancel(); | 143 chromeos::UserAddingScreen::Get()->Cancel(); |
| 144 content::RunAllPendingInMessageLoop(); | 144 content::RunAllPendingInMessageLoop(); |
| 145 EXPECT_EQ(1, GetStateChangedCountAndReset()); | 145 EXPECT_EQ(1, GetStateChangedCountAndReset()); |
| 146 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id)); | 146 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id)); |
| 147 } | 147 } |
| OLD | NEW |