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

Side by Side Diff: ash/system/chromeos/network/network_state_notifier_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (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 "ash/system/chromeos/network/network_state_notifier.h" 5 #include "ash/system/chromeos/network/network_state_notifier.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_widget.h" 8 #include "ash/shelf/shelf_widget.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/chromeos/network/network_connect.h" 10 #include "ash/system/chromeos/network/network_connect.h"
(...skipping 22 matching lines...) Expand all
33 using chromeos::ShillServiceClient; 33 using chromeos::ShillServiceClient;
34 34
35 namespace ash { 35 namespace ash {
36 namespace test { 36 namespace test {
37 37
38 class NetworkStateNotifierTest : public AshTestBase { 38 class NetworkStateNotifierTest : public AshTestBase {
39 public: 39 public:
40 NetworkStateNotifierTest() {} 40 NetworkStateNotifierTest() {}
41 virtual ~NetworkStateNotifierTest() {} 41 virtual ~NetworkStateNotifierTest() {}
42 42
43 virtual void SetUp() OVERRIDE { 43 virtual void SetUp() override {
44 DBusThreadManager::Initialize(); 44 DBusThreadManager::Initialize();
45 chromeos::LoginState::Initialize(); 45 chromeos::LoginState::Initialize();
46 SetupDefaultShillState(); 46 SetupDefaultShillState();
47 chromeos::NetworkHandler::Initialize(); 47 chromeos::NetworkHandler::Initialize();
48 RunAllPendingInMessageLoop(); 48 RunAllPendingInMessageLoop();
49 AshTestBase::SetUp(); 49 AshTestBase::SetUp();
50 } 50 }
51 51
52 virtual void TearDown() OVERRIDE { 52 virtual void TearDown() override {
53 AshTestBase::TearDown(); 53 AshTestBase::TearDown();
54 chromeos::LoginState::Shutdown(); 54 chromeos::LoginState::Shutdown();
55 chromeos::NetworkHandler::Shutdown(); 55 chromeos::NetworkHandler::Shutdown();
56 DBusThreadManager::Shutdown(); 56 DBusThreadManager::Shutdown();
57 } 57 }
58 58
59 protected: 59 protected:
60 void SetupDefaultShillState() { 60 void SetupDefaultShillState() {
61 RunAllPendingInMessageLoop(); 61 RunAllPendingInMessageLoop();
62 ShillDeviceClient::TestInterface* device_test = 62 ShillDeviceClient::TestInterface* device_test =
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 RunAllPendingInMessageLoop(); 97 RunAllPendingInMessageLoop();
98 // Failure should spawn a notification. 98 // Failure should spawn a notification.
99 message_center::MessageCenter* message_center = 99 message_center::MessageCenter* message_center =
100 message_center::MessageCenter::Get(); 100 message_center::MessageCenter::Get();
101 EXPECT_TRUE(message_center->FindVisibleNotificationById( 101 EXPECT_TRUE(message_center->FindVisibleNotificationById(
102 network_connect::kNetworkConnectNotificationId)); 102 network_connect::kNetworkConnectNotificationId));
103 } 103 }
104 104
105 } // namespace test 105 } // namespace test
106 } // namespace ash 106 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_state_notifier.h ('k') | ash/system/chromeos/network/tray_network.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698