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

Side by Side Diff: ash/system/chromeos/supervised/tray_supervised_user_unittest.cc

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround Created 5 years, 11 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
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 "ash/system/chromeos/supervised/tray_supervised_user.h" 5 #include "ash/system/chromeos/supervised/tray_supervised_user.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/user/login_status.h" 8 #include "ash/system/user/login_status.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "ash/test/test_system_tray_delegate.h" 10 #include "ash/test/test_system_tray_delegate.h"
11 #include "ui/message_center/message_center.h" 11 #include "ui/message_center/message_center.h"
12 #include "ui/message_center/notification.h" 12 #include "ui/message_center/notification.h"
13 #include "ui/message_center/notification_list.h" 13 #include "ui/message_center/notification_list.h"
14 #include "ui/message_center/notification_types.h" 14 #include "ui/message_center/notification_types.h"
15 15
16 using message_center::NotificationList; 16 using message_center::NotificationList;
17 17
18 namespace ash { 18 namespace ash {
19 19
20 class TraySupervisedUserTest : public test::AshTestBase { 20 class TraySupervisedUserTest : public test::AshTestBase {
21 public: 21 public:
22 TraySupervisedUserTest() {} 22 TraySupervisedUserTest() {}
23 virtual ~TraySupervisedUserTest() {} 23 ~TraySupervisedUserTest() override {}
24 24
25 protected: 25 protected:
26 message_center::Notification* GetPopup(); 26 message_center::Notification* GetPopup();
27 27
28 private: 28 private:
29 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserTest); 29 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserTest);
30 }; 30 };
31 31
32 message_center::Notification* TraySupervisedUserTest::GetPopup() { 32 message_center::Notification* TraySupervisedUserTest::GetPopup() {
33 NotificationList::PopupNotifications popups = 33 NotificationList::PopupNotifications popups =
34 message_center::MessageCenter::Get()->GetPopupNotifications(); 34 message_center::MessageCenter::Get()->GetPopupNotifications();
35 for (NotificationList::PopupNotifications::const_iterator iter = 35 for (NotificationList::PopupNotifications::const_iterator iter =
36 popups.begin(); iter != popups.end(); ++iter) { 36 popups.begin(); iter != popups.end(); ++iter) {
37 if ((*iter)->id() == TraySupervisedUser::kNotificationId) 37 if ((*iter)->id() == TraySupervisedUser::kNotificationId)
38 return *iter; 38 return *iter;
39 } 39 }
40 return NULL; 40 return NULL;
41 } 41 }
42 42
43 class TraySupervisedUserInitialTest : public TraySupervisedUserTest { 43 class TraySupervisedUserInitialTest : public TraySupervisedUserTest {
44 public: 44 public:
45 TraySupervisedUserInitialTest() {} 45 TraySupervisedUserInitialTest() {}
46 virtual ~TraySupervisedUserInitialTest() {} 46 ~TraySupervisedUserInitialTest() override {}
47 47
48 virtual void SetUp() override; 48 void SetUp() override;
49 virtual void TearDown() override; 49 void TearDown() override;
50 50
51 private: 51 private:
52 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserInitialTest); 52 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserInitialTest);
53 }; 53 };
54 54
55 void TraySupervisedUserInitialTest::SetUp() { 55 void TraySupervisedUserInitialTest::SetUp() {
56 test::TestSystemTrayDelegate::SetInitialLoginStatus( 56 test::TestSystemTrayDelegate::SetInitialLoginStatus(
57 user::LOGGED_IN_SUPERVISED); 57 user::LOGGED_IN_SUPERVISED);
58 test::AshTestBase::SetUp(); 58 test::AshTestBase::SetUp();
59 } 59 }
(...skipping 18 matching lines...) Expand all
78 TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) { 78 TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) {
79 // Initial login status is already SUPERVISED, which should create 79 // Initial login status is already SUPERVISED, which should create
80 // the notification and should not cause crashes. 80 // the notification and should not cause crashes.
81 message_center::Notification* notification = GetPopup(); 81 message_center::Notification* notification = GetPopup();
82 ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification); 82 ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification);
83 EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY), 83 EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY),
84 notification->rich_notification_data().priority); 84 notification->rich_notification_data().priority);
85 } 85 }
86 86
87 } // namespace 87 } // namespace
OLDNEW
« no previous file with comments | « ash/system/chromeos/supervised/tray_supervised_user.h ('k') | ash/system/chromeos/system_clock_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698