summaryrefslogtreecommitdiffstats
path: root/extensions/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/renderer')
-rw-r--r--extensions/renderer/activity_log_converter_strategy_unittest.cc2
-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.cc2
-rw-r--r--extensions/renderer/api_test_base.h4
-rw-r--r--extensions/renderer/api_test_base_unittest.cc2
-rw-r--r--extensions/renderer/event_unittest.cc2
-rw-r--r--extensions/renderer/json_schema_unittest.cc2
-rw-r--r--extensions/renderer/messaging_utils_unittest.cc2
-rw-r--r--extensions/renderer/module_system_test.h6
-rw-r--r--extensions/renderer/utils_unittest.cc2
11 files changed, 16 insertions, 16 deletions
diff --git a/extensions/renderer/activity_log_converter_strategy_unittest.cc b/extensions/renderer/activity_log_converter_strategy_unittest.cc
index 9331693..137c544 100644
--- a/extensions/renderer/activity_log_converter_strategy_unittest.cc
+++ b/extensions/renderer/activity_log_converter_strategy_unittest.cc
@@ -23,7 +23,7 @@ class ActivityLogConverterStrategyTest : public testing::Test {
}
protected:
- virtual void SetUp() {
+ void SetUp() override {
converter_.reset(V8ValueConverter::create());
strategy_.reset(new ActivityLogConverterStrategy());
converter_->SetFunctionAllowed(true);
diff --git a/extensions/renderer/api/serial/data_receiver_unittest.cc b/extensions/renderer/api/serial/data_receiver_unittest.cc
index 2415e00..381e361 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 {
+ 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 {
+ 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 77dcfe1..eac7e41c 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 {
+ 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 {
+ 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 9a07cd7..31362eb 100644
--- a/extensions/renderer/api/serial/serial_api_unittest.cc
+++ b/extensions/renderer/api/serial/serial_api_unittest.cc
@@ -394,7 +394,7 @@ class SerialApiTest : public ApiTestBase {
public:
SerialApiTest() {}
- virtual void SetUp() override {
+ void SetUp() override {
ApiTestBase::SetUp();
env()->RegisterModule("async_waiter", IDR_ASYNC_WAITER_JS);
env()->RegisterModule("data_receiver", IDR_DATA_RECEIVER_JS);
diff --git a/extensions/renderer/api_test_base.h b/extensions/renderer/api_test_base.h
index c9a23e3..cc12e73 100644
--- a/extensions/renderer/api_test_base.h
+++ b/extensions/renderer/api_test_base.h
@@ -72,8 +72,8 @@ class TestServiceProvider : public gin::Wrappable<TestServiceProvider> {
class ApiTestBase : public ModuleSystemTest {
protected:
ApiTestBase();
- virtual ~ApiTestBase();
- virtual void SetUp() override;
+ ~ApiTestBase() override;
+ void SetUp() override;
void RunTest(const std::string& file_name, const std::string& test_name);
TestServiceProvider* service_provider() { return service_provider_; }
diff --git a/extensions/renderer/api_test_base_unittest.cc b/extensions/renderer/api_test_base_unittest.cc
index 5b52fd73..149e34e 100644
--- a/extensions/renderer/api_test_base_unittest.cc
+++ b/extensions/renderer/api_test_base_unittest.cc
@@ -8,7 +8,7 @@ namespace extensions {
class ApiTestBaseTest : public ApiTestBase {
public:
- virtual void SetUp() override { ApiTestBase::SetUp(); }
+ void SetUp() override { ApiTestBase::SetUp(); }
};
TEST_F(ApiTestBaseTest, TestEnvironment) {
diff --git a/extensions/renderer/event_unittest.cc b/extensions/renderer/event_unittest.cc
index 73ff56e..4144a01 100644
--- a/extensions/renderer/event_unittest.cc
+++ b/extensions/renderer/event_unittest.cc
@@ -10,7 +10,7 @@ namespace extensions {
namespace {
class EventUnittest : public ModuleSystemTest {
- virtual void SetUp() override {
+ void SetUp() override {
ModuleSystemTest::SetUp();
env()->RegisterModule(kEventBindings, IDR_EVENT_BINDINGS_JS);
diff --git a/extensions/renderer/json_schema_unittest.cc b/extensions/renderer/json_schema_unittest.cc
index 8e29f55..920616b 100644
--- a/extensions/renderer/json_schema_unittest.cc
+++ b/extensions/renderer/json_schema_unittest.cc
@@ -10,7 +10,7 @@ namespace extensions {
class JsonSchemaTest : public ModuleSystemTest {
public:
- virtual void SetUp() override {
+ void SetUp() override {
ModuleSystemTest::SetUp();
env()->RegisterModule("json_schema", IDR_JSON_SCHEMA_JS);
diff --git a/extensions/renderer/messaging_utils_unittest.cc b/extensions/renderer/messaging_utils_unittest.cc
index bd7dbff..fbb2dec 100644
--- a/extensions/renderer/messaging_utils_unittest.cc
+++ b/extensions/renderer/messaging_utils_unittest.cc
@@ -24,7 +24,7 @@ class MessagingUtilsUnittest : public ModuleSystemTest {
}
private:
- virtual void SetUp() override {
+ void SetUp() override {
ModuleSystemTest::SetUp();
env()->RegisterModule("messaging_utils", IDR_MESSAGING_UTILS_JS);
diff --git a/extensions/renderer/module_system_test.h b/extensions/renderer/module_system_test.h
index 58501ab..dd2686b 100644
--- a/extensions/renderer/module_system_test.h
+++ b/extensions/renderer/module_system_test.h
@@ -79,10 +79,10 @@ class ModuleSystemTestEnvironment {
class ModuleSystemTest : public testing::Test {
public:
ModuleSystemTest();
- virtual ~ModuleSystemTest();
+ ~ModuleSystemTest() override;
- virtual void SetUp() override;
- virtual void TearDown() override;
+ void SetUp() override;
+ void TearDown() override;
protected:
ModuleSystemTestEnvironment* env() { return env_.get(); }
diff --git a/extensions/renderer/utils_unittest.cc b/extensions/renderer/utils_unittest.cc
index 8a88952..06e20f6 100644
--- a/extensions/renderer/utils_unittest.cc
+++ b/extensions/renderer/utils_unittest.cc
@@ -12,7 +12,7 @@ namespace {
class UtilsUnittest : public ModuleSystemTest {
private:
- virtual void SetUp() override {
+ void SetUp() override {
ModuleSystemTest::SetUp();
env()->RegisterModule("utils", IDR_UTILS_JS);