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

Unified Diff: mojo/public/cpp/bindings/tests/handle_passing_unittest.cc

Issue 617503003: Mojo: MOJO_OVERRIDE -> override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 3 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
Index: mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
index 696e6135fe63fe25794791b93292cf9a96629942..43598e15bf96dd281e279f8934e9492e0e51b2ee 100644
--- a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
@@ -29,9 +29,7 @@ class StringRecorder {
class ImportedInterfaceImpl
: public InterfaceImpl<imported::ImportedInterface> {
public:
- virtual void DoSomething() MOJO_OVERRIDE {
- do_something_count_++;
- }
+ virtual void DoSomething() override { do_something_count_++; }
static int do_something_count() { return do_something_count_; }
@@ -42,12 +40,10 @@ int ImportedInterfaceImpl::do_something_count_ = 0;
class SampleNamedObjectImpl : public InterfaceImpl<sample::NamedObject> {
public:
- virtual void SetName(const mojo::String& name) MOJO_OVERRIDE {
- name_ = name;
- }
+ virtual void SetName(const mojo::String& name) override { name_ = name; }
- virtual void GetName(const mojo::Callback<void(mojo::String)>& callback)
- MOJO_OVERRIDE {
+ virtual void GetName(
+ const mojo::Callback<void(mojo::String)>& callback) override {
callback.Run(name_);
}
@@ -58,7 +54,7 @@ class SampleNamedObjectImpl : public InterfaceImpl<sample::NamedObject> {
class SampleFactoryImpl : public InterfaceImpl<sample::Factory> {
public:
virtual void DoStuff(sample::RequestPtr request,
- ScopedMessagePipeHandle pipe) MOJO_OVERRIDE {
+ ScopedMessagePipeHandle pipe) override {
std::string text1;
if (pipe.is_valid())
EXPECT_TRUE(ReadTextMessage(pipe.get(), &text1));
@@ -86,7 +82,7 @@ class SampleFactoryImpl : public InterfaceImpl<sample::Factory> {
request->obj->DoSomething();
}
- virtual void DoStuff2(ScopedDataPipeConsumerHandle pipe) MOJO_OVERRIDE {
+ virtual void DoStuff2(ScopedDataPipeConsumerHandle pipe) override {
// Read the data from the pipe, writing the response (as a string) to
// DidStuff2().
ASSERT_TRUE(pipe.is_valid());
@@ -105,7 +101,7 @@ class SampleFactoryImpl : public InterfaceImpl<sample::Factory> {
}
virtual void CreateNamedObject(
- InterfaceRequest<sample::NamedObject> object_request) MOJO_OVERRIDE {
+ InterfaceRequest<sample::NamedObject> object_request) override {
EXPECT_TRUE(object_request.is_pending());
BindToRequest(new SampleNamedObjectImpl(), &object_request);
}
@@ -116,11 +112,11 @@ class SampleFactoryImpl : public InterfaceImpl<sample::Factory> {
virtual void RequestImportedInterface(
InterfaceRequest<imported::ImportedInterface> imported,
const mojo::Callback<void(InterfaceRequest<imported::ImportedInterface>)>&
- callback) MOJO_OVERRIDE {}
+ callback) override {}
virtual void TakeImportedInterface(
imported::ImportedInterfacePtr imported,
const mojo::Callback<void(imported::ImportedInterfacePtr)>& callback)
- MOJO_OVERRIDE {}
+ override {}
private:
ScopedMessagePipeHandle pipe1_;
@@ -140,7 +136,7 @@ class SampleFactoryClientImpl : public sample::FactoryClient {
}
virtual void DidStuff(sample::ResponsePtr response,
- const String& text_reply) MOJO_OVERRIDE {
+ const String& text_reply) override {
EXPECT_EQ(expected_text_reply_, text_reply);
if (response->pipe.is_valid()) {
@@ -161,7 +157,7 @@ class SampleFactoryClientImpl : public sample::FactoryClient {
got_response_ = true;
}
- virtual void DidStuff2(const String& text_reply) MOJO_OVERRIDE {
+ virtual void DidStuff2(const String& text_reply) override {
got_response_ = true;
EXPECT_EQ(expected_text_reply_, text_reply);
}
« no previous file with comments | « mojo/public/cpp/bindings/tests/connector_unittest.cc ('k') | mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698