Index: chromeos/network/network_configuration_handler_unittest.cc |
diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc |
index 3609b11dcd0c4b1412fb9b6a29ade6fe485ade01..da754f6977a041e10ec51973950e071ef3876a44 100644 |
--- a/chromeos/network/network_configuration_handler_unittest.cc |
+++ b/chromeos/network/network_configuration_handler_unittest.cc |
@@ -97,7 +97,7 @@ class NetworkConfigurationHandlerTest : public testing::Test { |
dictionary_value_result_(NULL) {} |
virtual ~NetworkConfigurationHandlerTest() {} |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
scoped_ptr<DBusThreadManagerSetter> dbus_setter = |
DBusThreadManager::GetSetterForTesting(); |
mock_manager_client_ = new MockShillManagerClient(); |
@@ -125,7 +125,7 @@ class NetworkConfigurationHandlerTest : public testing::Test { |
message_loop_.RunUntilIdle(); |
} |
- virtual void TearDown() OVERRIDE { |
+ virtual void TearDown() override { |
network_configuration_handler_.reset(); |
network_state_handler_.reset(); |
DBusThreadManager::Shutdown(); |
@@ -398,11 +398,11 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver { |
TestObserver() : network_list_changed_count_(0) {} |
virtual ~TestObserver() {} |
- virtual void NetworkListChanged() OVERRIDE { |
+ virtual void NetworkListChanged() override { |
++network_list_changed_count_; |
} |
- virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE { |
+ virtual void NetworkPropertiesUpdated(const NetworkState* network) override { |
property_updates_[network->path()]++; |
} |
@@ -433,7 +433,7 @@ class NetworkConfigurationHandlerStubTest : public testing::Test { |
virtual ~NetworkConfigurationHandlerStubTest() { |
} |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
DBusThreadManager::Initialize(); |
network_state_handler_.reset(NetworkStateHandler::InitializeForTest()); |
@@ -447,7 +447,7 @@ class NetworkConfigurationHandlerStubTest : public testing::Test { |
test_observer_->ClearPropertyUpdates(); |
} |
- virtual void TearDown() OVERRIDE { |
+ virtual void TearDown() override { |
network_configuration_handler_.reset(); |
network_state_handler_->RemoveObserver(test_observer_.get(), FROM_HERE); |
network_state_handler_.reset(); |