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

Unified Diff: mojo/examples/apptest/example_apptest.cc

Issue 644963004: Some more virtual/override updates. (Closed) Base URL: https://github.com/domokit/mojo.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/common/handle_watcher_unittest.cc ('k') | mojo/public/c/system/tests/core_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/apptest/example_apptest.cc
diff --git a/mojo/examples/apptest/example_apptest.cc b/mojo/examples/apptest/example_apptest.cc
index 2041fde46adaad587507e87417946917f355d193..f5dccabab46cbc6c55527eff60b5f1e68b8dc2cc 100644
--- a/mojo/examples/apptest/example_apptest.cc
+++ b/mojo/examples/apptest/example_apptest.cc
@@ -32,7 +32,7 @@ class Apptest : public testing::Test {
: args_(args.Pass()),
application_impl_(nullptr) {
}
- virtual ~Apptest() override {}
+ ~Apptest() override {}
protected:
ApplicationImpl* application_impl() { return application_impl_; }
@@ -41,7 +41,7 @@ class Apptest : public testing::Test {
virtual ApplicationDelegate* GetApplicationDelegate() = 0;
// testing::Test:
- virtual void SetUp() override {
+ void SetUp() override {
// New applications are constructed for each test to avoid persisting state.
MOJO_CHECK(g_shell_message_pipe_handle_hack.is_valid());
application_impl_ = new ApplicationImpl(
@@ -51,7 +51,7 @@ class Apptest : public testing::Test {
// Fake application initialization with the given command line arguments.
application_impl_->Initialize(args_.Clone());
}
- virtual void TearDown() override {
+ void TearDown() override {
g_shell_message_pipe_handle_hack =
application_impl_->UnbindShell().release();
delete application_impl_;
@@ -75,14 +75,14 @@ class ExampleApptest : public Apptest {
public:
// TODO(msw): Exemplify the use of actual command line arguments.
ExampleApptest() : Apptest(Array<String>()) {}
- virtual ~ExampleApptest() override {}
+ ~ExampleApptest() override {}
protected:
// Apptest:
- virtual ApplicationDelegate* GetApplicationDelegate() override {
+ ApplicationDelegate* GetApplicationDelegate() override {
return &example_client_application_;
}
- virtual void SetUp() override {
+ void SetUp() override {
Apptest::SetUp();
application_impl()->ConnectToService("mojo:example_service",
&example_service_);
@@ -117,8 +117,8 @@ TEST_F(ExampleApptest, PingServiceToPongClient) {
template <typename T>
struct SetCallback : public Callback<void()>::Runnable {
SetCallback(T* val, T result) : val_(val), result_(result) {}
- virtual ~SetCallback() {}
- virtual void Run() const override { *val_ = result_; }
+ ~SetCallback() override {}
+ void Run() const override { *val_ = result_; }
T* val_;
T result_;
};
« no previous file with comments | « mojo/common/handle_watcher_unittest.cc ('k') | mojo/public/c/system/tests/core_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698