summaryrefslogtreecommitdiffstats
path: root/extensions/renderer/api
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 09:32:19 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 16:32:37 +0000
commit0eac4e1becc07e32503722d9ffd421cf8c8688e3 (patch)
treeb8777ad781ca887318c7760bb7380fd662497558 /extensions/renderer/api
parentc0fd0633fb72a4e71acaf09f47202c8b8225a015 (diff)
downloadchromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.zip
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.gz
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.bz2
replace OVERRIDE and FINAL with override and final in extensions/
BUG=417463 Review URL: https://codereview.chromium.org/622343002 Cr-Commit-Position: refs/heads/master@{#298042}
Diffstat (limited to 'extensions/renderer/api')
-rw-r--r--extensions/renderer/api/serial/data_receiver_unittest.cc4
-rw-r--r--extensions/renderer/api/serial/data_sender_unittest.cc4
-rw-r--r--extensions/renderer/api/serial/serial_api_unittest.cc26
3 files changed, 17 insertions, 17 deletions
diff --git a/extensions/renderer/api/serial/data_receiver_unittest.cc b/extensions/renderer/api/serial/data_receiver_unittest.cc
index 567fdc4..2415e00 100644
--- a/extensions/renderer/api/serial/data_receiver_unittest.cc
+++ b/extensions/renderer/api/serial/data_receiver_unittest.cc
@@ -16,7 +16,7 @@ class DataReceiverTest : public ApiTestBase {
public:
DataReceiverTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ApiTestBase::SetUp();
env()->RegisterModule("async_waiter", IDR_ASYNC_WAITER_JS);
env()->RegisterModule("data_receiver", IDR_DATA_RECEIVER_JS);
@@ -28,7 +28,7 @@ class DataReceiverTest : public ApiTestBase {
&DataReceiverTest::CreateDataSource, base::Unretained(this)));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
if (sender_.get()) {
sender_->ShutDown();
sender_ = NULL;
diff --git a/extensions/renderer/api/serial/data_sender_unittest.cc b/extensions/renderer/api/serial/data_sender_unittest.cc
index 18a6236..77dcfe1 100644
--- a/extensions/renderer/api/serial/data_sender_unittest.cc
+++ b/extensions/renderer/api/serial/data_sender_unittest.cc
@@ -16,7 +16,7 @@ class DataSenderTest : public ApiTestBase {
public:
DataSenderTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ApiTestBase::SetUp();
env()->RegisterModule("async_waiter", IDR_ASYNC_WAITER_JS);
env()->RegisterModule("data_sender", IDR_DATA_SENDER_JS);
@@ -28,7 +28,7 @@ class DataSenderTest : public ApiTestBase {
base::Bind(&DataSenderTest::CreateDataSink, base::Unretained(this)));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
if (receiver_.get()) {
receiver_->ShutDown();
receiver_ = NULL;
diff --git a/extensions/renderer/api/serial/serial_api_unittest.cc b/extensions/renderer/api/serial/serial_api_unittest.cc
index b4f8153..bf14bf3 100644
--- a/extensions/renderer/api/serial/serial_api_unittest.cc
+++ b/extensions/renderer/api/serial/serial_api_unittest.cc
@@ -18,7 +18,7 @@ namespace extensions {
namespace {
class FakeSerialDeviceEnumerator : public device::SerialDeviceEnumerator {
- virtual mojo::Array<device::serial::DeviceInfoPtr> GetDevices() OVERRIDE {
+ virtual mojo::Array<device::serial::DeviceInfoPtr> GetDevices() override {
mojo::Array<device::serial::DeviceInfoPtr> result(3);
result[0] = device::serial::DeviceInfo::New();
result[0]->path = "device";
@@ -122,7 +122,7 @@ class SetControlSignalsTestIoHandler : public TestIoHandlerBase {
SetControlSignalsTestIoHandler() {}
virtual bool SetControlSignals(
- const device::serial::HostControlSignals& signals) OVERRIDE {
+ const device::serial::HostControlSignals& signals) override {
static const device::serial::HostControlSignals expected_signals[] = {
GenerateControlSignals(OPTIONAL_VALUE_UNSET, OPTIONAL_VALUE_UNSET),
GenerateControlSignals(OPTIONAL_VALUE_FALSE, OPTIONAL_VALUE_UNSET),
@@ -156,7 +156,7 @@ class GetControlSignalsTestIoHandler : public TestIoHandlerBase {
GetControlSignalsTestIoHandler() {}
virtual device::serial::DeviceControlSignalsPtr GetControlSignals()
- const OVERRIDE {
+ const override {
device::serial::DeviceControlSignalsPtr signals(
device::serial::DeviceControlSignals::New());
signals->dcd = num_calls() & 1;
@@ -177,7 +177,7 @@ class ConfigurePortTestIoHandler : public TestIoHandlerBase {
public:
ConfigurePortTestIoHandler() {}
virtual bool ConfigurePort(
- const device::serial::ConnectionOptions& options) OVERRIDE {
+ const device::serial::ConnectionOptions& options) override {
static const device::serial::ConnectionOptions expected_options[] = {
GenerateConnectionOptions(9600,
device::serial::DATA_BITS_EIGHT,
@@ -260,7 +260,7 @@ class FlushTestIoHandler : public TestIoHandlerBase {
public:
FlushTestIoHandler() {}
- virtual bool Flush() const OVERRIDE {
+ virtual bool Flush() const override {
record_call();
return true;
}
@@ -275,7 +275,7 @@ class FailToConnectTestIoHandler : public TestIoHandlerBase {
public:
FailToConnectTestIoHandler() {}
virtual void Open(const std::string& port,
- const OpenCompleteCallback& callback) OVERRIDE {
+ const OpenCompleteCallback& callback) override {
callback.Run(false);
return;
}
@@ -290,7 +290,7 @@ class FailToGetInfoTestIoHandler : public TestIoHandlerBase {
public:
explicit FailToGetInfoTestIoHandler(int times_to_succeed)
: times_to_succeed_(times_to_succeed) {}
- virtual device::serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE {
+ virtual device::serial::ConnectionInfoPtr GetPortInfo() const override {
if (times_to_succeed_-- > 0)
return device::TestSerialIoHandler::GetPortInfo();
return device::serial::ConnectionInfoPtr();
@@ -309,7 +309,7 @@ class SendErrorTestIoHandler : public TestIoHandlerBase {
explicit SendErrorTestIoHandler(device::serial::SendError error)
: error_(error) {}
- virtual void WriteImpl() OVERRIDE { QueueWriteCompleted(0, error_); }
+ virtual void WriteImpl() override { QueueWriteCompleted(0, error_); }
private:
virtual ~SendErrorTestIoHandler() {}
@@ -324,7 +324,7 @@ class FixedDataReceiveTestIoHandler : public TestIoHandlerBase {
explicit FixedDataReceiveTestIoHandler(const std::string& data)
: data_(data) {}
- virtual void ReadImpl() OVERRIDE {
+ virtual void ReadImpl() override {
if (pending_read_buffer_len() < data_.size())
return;
memcpy(pending_read_buffer(), data_.c_str(), data_.size());
@@ -345,7 +345,7 @@ class ReceiveErrorTestIoHandler : public TestIoHandlerBase {
explicit ReceiveErrorTestIoHandler(device::serial::ReceiveError error)
: error_(error) {}
- virtual void ReadImpl() OVERRIDE { QueueReadCompleted(0, error_); }
+ virtual void ReadImpl() override { QueueReadCompleted(0, error_); }
private:
virtual ~ReceiveErrorTestIoHandler() {}
@@ -358,7 +358,7 @@ class ReceiveErrorTestIoHandler : public TestIoHandlerBase {
class SendDataWithErrorIoHandler : public TestIoHandlerBase {
public:
SendDataWithErrorIoHandler() : sent_error_(false) {}
- virtual void WriteImpl() OVERRIDE {
+ virtual void WriteImpl() override {
if (sent_error_) {
WriteCompleted(pending_write_buffer_len(),
device::serial::SEND_ERROR_NONE);
@@ -381,7 +381,7 @@ class SendDataWithErrorIoHandler : public TestIoHandlerBase {
class BlockSendsForeverSendIoHandler : public TestIoHandlerBase {
public:
BlockSendsForeverSendIoHandler() {}
- virtual void WriteImpl() OVERRIDE {}
+ virtual void WriteImpl() override {}
private:
virtual ~BlockSendsForeverSendIoHandler() {}
@@ -395,7 +395,7 @@ class SerialApiTest : public ApiTestBase {
public:
SerialApiTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ApiTestBase::SetUp();
env()->RegisterModule("async_waiter", IDR_ASYNC_WAITER_JS);
env()->RegisterModule("data_receiver", IDR_DATA_RECEIVER_JS);