diff options
author | anujk.sharma <anujk.sharma@samsung.com> | 2014-10-07 00:29:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 07:30:31 +0000 |
commit | 1a60a65835b7189dca67332134391f3a325e2047 (patch) | |
tree | ef841e42b16760ce37d5c9ebfd1437cb09fe5466 | |
parent | 263c31370ed81377b59ed58b9ae41ded18630c13 (diff) | |
download | chromium_src-1a60a65835b7189dca67332134391f3a325e2047.zip chromium_src-1a60a65835b7189dca67332134391f3a325e2047.tar.gz chromium_src-1a60a65835b7189dca67332134391f3a325e2047.tar.bz2 |
Replacing the OVERRIDE with override and FINAL with final in /src/dbus
This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.
BUG=417463
Review URL: https://codereview.chromium.org/629883003
Cr-Commit-Position: refs/heads/master@{#298415}
-rw-r--r-- | dbus/bus.cc | 4 | ||||
-rw-r--r-- | dbus/dbus_statistics_unittest.cc | 4 | ||||
-rw-r--r-- | dbus/mock_object_proxy.h | 4 | ||||
-rw-r--r-- | dbus/object_manager_unittest.cc | 6 | ||||
-rw-r--r-- | dbus/object_proxy_unittest.cc | 4 | ||||
-rw-r--r-- | dbus/test_service.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/dbus/bus.cc b/dbus/bus.cc index 3cad3c8..e9e77a5 100644 --- a/dbus/bus.cc +++ b/dbus/bus.cc @@ -84,13 +84,13 @@ class Watch : public base::MessagePumpLibevent::Watcher { private: // Implement MessagePumpLibevent::Watcher. - virtual void OnFileCanReadWithoutBlocking(int file_descriptor) OVERRIDE { + virtual void OnFileCanReadWithoutBlocking(int file_descriptor) override { const bool success = dbus_watch_handle(raw_watch_, DBUS_WATCH_READABLE); CHECK(success) << "Unable to allocate memory"; } // Implement MessagePumpLibevent::Watcher. - virtual void OnFileCanWriteWithoutBlocking(int file_descriptor) OVERRIDE { + virtual void OnFileCanWriteWithoutBlocking(int file_descriptor) override { const bool success = dbus_watch_handle(raw_watch_, DBUS_WATCH_WRITABLE); CHECK(success) << "Unable to allocate memory"; } diff --git a/dbus/dbus_statistics_unittest.cc b/dbus/dbus_statistics_unittest.cc index 9a2e2a1..0c0dd03 100644 --- a/dbus/dbus_statistics_unittest.cc +++ b/dbus/dbus_statistics_unittest.cc @@ -15,11 +15,11 @@ class DBusStatisticsTest : public testing::Test { DBusStatisticsTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { statistics::Initialize(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { statistics::Shutdown(); } diff --git a/dbus/mock_object_proxy.h b/dbus/mock_object_proxy.h index b5900ad..7c61b47 100644 --- a/dbus/mock_object_proxy.h +++ b/dbus/mock_object_proxy.h @@ -32,14 +32,14 @@ class MockObjectProxy : public ObjectProxy { virtual scoped_ptr<Response> CallMethodAndBlockWithErrorDetails( MethodCall* method_call, int timeout_ms, - ScopedDBusError* error) OVERRIDE { + ScopedDBusError* error) override { return scoped_ptr<Response>( MockCallMethodAndBlockWithErrorDetails(method_call, timeout_ms, error)); } MOCK_METHOD2(MockCallMethodAndBlock, Response*(MethodCall* method_call, int timeout_ms)); virtual scoped_ptr<Response> CallMethodAndBlock(MethodCall* method_call, - int timeout_ms) OVERRIDE { + int timeout_ms) override { return scoped_ptr<Response>(MockCallMethodAndBlock(method_call, timeout_ms)); } diff --git a/dbus/object_manager_unittest.cc b/dbus/object_manager_unittest.cc index 54ddeac..cd02c5e 100644 --- a/dbus/object_manager_unittest.cc +++ b/dbus/object_manager_unittest.cc @@ -51,7 +51,7 @@ class ObjectManagerTest virtual PropertySet* CreateProperties( ObjectProxy* object_proxy, const ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { Properties* properties = new Properties( object_proxy, interface_name, base::Bind(&ObjectManagerTest::OnPropertyChanged, @@ -127,14 +127,14 @@ class ObjectManagerTest protected: // Called when an object is added. virtual void ObjectAdded(const ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { added_objects_.push_back(std::make_pair(object_path, interface_name)); run_loop_->Quit(); } // Called when an object is removed. virtual void ObjectRemoved(const ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { removed_objects_.push_back(std::make_pair(object_path, interface_name)); run_loop_->Quit(); } diff --git a/dbus/object_proxy_unittest.cc b/dbus/object_proxy_unittest.cc index 1cf667c..246058d 100644 --- a/dbus/object_proxy_unittest.cc +++ b/dbus/object_proxy_unittest.cc @@ -15,7 +15,7 @@ namespace { class ObjectProxyTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { Bus::Options bus_options; bus_options.bus_type = Bus::SESSION; bus_options.connection_type = Bus::PRIVATE; @@ -25,7 +25,7 @@ class ObjectProxyTest : public testing::Test { "org.chromium.TestService", ObjectPath("/org/chromium/TestObject")); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { bus_->ShutdownAndBlock(); } diff --git a/dbus/test_service.h b/dbus/test_service.h index 8039fe8..cc7d521 100644 --- a/dbus/test_service.h +++ b/dbus/test_service.h @@ -106,7 +106,7 @@ class TestService : public base::Thread { bool success); // base::Thread override. - virtual void Run(base::MessageLoop* message_loop) OVERRIDE; + virtual void Run(base::MessageLoop* message_loop) override; // // Exported methods. |