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

Unified Diff: mojo/apps/js/test/js_to_cpp_unittest.cc

Issue 668663006: Standardize usage of virtual/override/final in mojo/ (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/apps/js/test/handle_unittest.cc ('k') | mojo/bindings/js/handle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/apps/js/test/js_to_cpp_unittest.cc
diff --git a/mojo/apps/js/test/js_to_cpp_unittest.cc b/mojo/apps/js/test/js_to_cpp_unittest.cc
index 44526a45c045a7a5dfd51e9274a2a06e95eabf78..0c44b75d5f73dbfd3afde79a809a622506649aa3 100644
--- a/mojo/apps/js/test/js_to_cpp_unittest.cc
+++ b/mojo/apps/js/test/js_to_cpp_unittest.cc
@@ -212,7 +212,7 @@ class CppSideConnection : public js_to_cpp::CppSide {
js_side_(NULL),
mishandled_messages_(0) {
}
- virtual ~CppSideConnection() {}
+ ~CppSideConnection() override {}
void set_run_loop(base::RunLoop* run_loop) { run_loop_ = run_loop; }
base::RunLoop* run_loop() { return run_loop_; }
@@ -221,28 +221,21 @@ class CppSideConnection : public js_to_cpp::CppSide {
js_to_cpp::JsSide* js_side() { return js_side_; }
// js_to_cpp::CppSide:
- virtual void StartTest() override {
- NOTREACHED();
- }
+ void StartTest() override { NOTREACHED(); }
- virtual void TestFinished() override {
- NOTREACHED();
- }
+ void TestFinished() override { NOTREACHED(); }
- virtual void PingResponse() override {
- mishandled_messages_ += 1;
- }
+ void PingResponse() override { mishandled_messages_ += 1; }
- virtual void EchoResponse(js_to_cpp::EchoArgsListPtr list) override {
+ void EchoResponse(js_to_cpp::EchoArgsListPtr list) override {
mishandled_messages_ += 1;
}
- virtual void BitFlipResponse(js_to_cpp::EchoArgsListPtr list) override {
+ void BitFlipResponse(js_to_cpp::EchoArgsListPtr list) override {
mishandled_messages_ += 1;
}
- virtual void BackPointerResponse(
- js_to_cpp::EchoArgsListPtr list) override {
+ void BackPointerResponse(js_to_cpp::EchoArgsListPtr list) override {
mishandled_messages_ += 1;
}
@@ -259,14 +252,12 @@ class CppSideConnection : public js_to_cpp::CppSide {
class PingCppSideConnection : public CppSideConnection {
public:
PingCppSideConnection() : got_message_(false) {}
- virtual ~PingCppSideConnection() {}
+ ~PingCppSideConnection() override {}
// js_to_cpp::CppSide:
- virtual void StartTest() override {
- js_side_->Ping();
- }
+ void StartTest() override { js_side_->Ping(); }
- virtual void PingResponse() override {
+ void PingResponse() override {
got_message_ = true;
run_loop()->Quit();
}
@@ -287,14 +278,14 @@ class EchoCppSideConnection : public CppSideConnection {
message_count_(0),
termination_seen_(false) {
}
- virtual ~EchoCppSideConnection() {}
+ ~EchoCppSideConnection() override {}
// js_to_cpp::CppSide:
- virtual void StartTest() override {
+ void StartTest() override {
js_side_->Echo(kExpectedMessageCount, BuildSampleEchoArgs());
}
- virtual void EchoResponse(js_to_cpp::EchoArgsListPtr list) override {
+ void EchoResponse(js_to_cpp::EchoArgsListPtr list) override {
const js_to_cpp::EchoArgsPtr& special_arg = list->item;
message_count_ += 1;
EXPECT_EQ(-1, special_arg->si64);
@@ -305,7 +296,7 @@ class EchoCppSideConnection : public CppSideConnection {
CheckSampleEchoArgsList(list->next);
}
- virtual void TestFinished() override {
+ void TestFinished() override {
termination_seen_ = true;
run_loop()->Quit();
}
@@ -327,18 +318,16 @@ class EchoCppSideConnection : public CppSideConnection {
class BitFlipCppSideConnection : public CppSideConnection {
public:
BitFlipCppSideConnection() : termination_seen_(false) {}
- virtual ~BitFlipCppSideConnection() {}
+ ~BitFlipCppSideConnection() override {}
// js_to_cpp::CppSide:
- virtual void StartTest() override {
- js_side_->BitFlip(BuildSampleEchoArgs());
- }
+ void StartTest() override { js_side_->BitFlip(BuildSampleEchoArgs()); }
- virtual void BitFlipResponse(js_to_cpp::EchoArgsListPtr list) override {
+ void BitFlipResponse(js_to_cpp::EchoArgsListPtr list) override {
CheckCorruptedEchoArgsList(list);
}
- virtual void TestFinished() override {
+ void TestFinished() override {
termination_seen_ = true;
run_loop()->Quit();
}
@@ -356,19 +345,16 @@ class BitFlipCppSideConnection : public CppSideConnection {
class BackPointerCppSideConnection : public CppSideConnection {
public:
BackPointerCppSideConnection() : termination_seen_(false) {}
- virtual ~BackPointerCppSideConnection() {}
+ ~BackPointerCppSideConnection() override {}
// js_to_cpp::CppSide:
- virtual void StartTest() override {
- js_side_->BackPointer(BuildSampleEchoArgs());
- }
+ void StartTest() override { js_side_->BackPointer(BuildSampleEchoArgs()); }
- virtual void BackPointerResponse(
- js_to_cpp::EchoArgsListPtr list) override {
+ void BackPointerResponse(js_to_cpp::EchoArgsListPtr list) override {
CheckCorruptedEchoArgsList(list);
}
- virtual void TestFinished() override {
+ void TestFinished() override {
termination_seen_ = true;
run_loop()->Quit();
}
« no previous file with comments | « mojo/apps/js/test/handle_unittest.cc ('k') | mojo/bindings/js/handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698