Mojo: MOJO_OVERRIDE -> override in mojo/.

mojo/public/cpp/bindings/tests/handle_passing_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/public/interfaces/bindings/tests/sample_factory.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 11 matching lines @@
   void Run(const String& a) const {
     *buf_ = a.To<std::string>();
   }
  private:
   std::string* buf_;
 };
 
 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_; }
 
  private:
   static int do_something_count_;
 };
 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_);
   }
 
  private:
   std::string name_;
 };
 
 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));
 
     std::string text2;
     if (request->pipe.is_valid()) {
       EXPECT_TRUE(ReadTextMessage(request->pipe.get(), &text2));
 
       // Ensure that simply accessing request->pipe does not close it.
       EXPECT_TRUE(request->pipe.is_valid());
     }
 
     ScopedMessagePipeHandle pipe0;
     if (!text2.empty()) {
       CreateMessagePipe(NULL, &pipe0, &pipe1_);
       EXPECT_TRUE(WriteTextMessage(pipe1_.get(), text2));
     }
 
     sample::ResponsePtr response(sample::Response::New());
     response->x = 2;
     response->pipe = pipe0.Pass();
     client()->DidStuff(response.Pass(), text1);
 
     if (request->obj)
       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());
     uint32_t data_size = 0;
     ASSERT_EQ(MOJO_RESULT_OK,
               ReadDataRaw(pipe.get(), NULL, &data_size,
                           MOJO_READ_DATA_FLAG_QUERY));
     ASSERT_NE(0, static_cast<int>(data_size));
     char data[64];
     ASSERT_LT(static_cast<int>(data_size), 64);
     ASSERT_EQ(MOJO_RESULT_OK,
               ReadDataRaw(pipe.get(), data, &data_size,
                           MOJO_READ_DATA_FLAG_ALL_OR_NONE));
 
     client()->DidStuff2(data);
   }
 
   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);
   }
 
   // These aren't called or implemented, but exist here to test that the
   // methods are generated with the correct argument types for imported
   // interfaces.
   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_;
 };
 
 class SampleFactoryClientImpl : public sample::FactoryClient {
  public:
   SampleFactoryClientImpl() : got_response_(false) {
   }
 
   void set_expected_text_reply(const std::string& expected_text_reply) {
     expected_text_reply_ = expected_text_reply;
   }
 
   bool got_response() const {
     return got_response_;
   }
 
   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()) {
       std::string text2;
       EXPECT_TRUE(ReadTextMessage(response->pipe.get(), &text2));
 
       // Ensure that simply accessing response.pipe does not close it.
       EXPECT_TRUE(response->pipe.is_valid());
 
       EXPECT_EQ(std::string(kText2), text2);
 
       // Do some more tests of handle passing:
       ScopedMessagePipeHandle p = response->pipe.Pass();
       EXPECT_TRUE(p.is_valid());
       EXPECT_FALSE(response->pipe.is_valid());
     }
 
     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);
   }
 
  private:
   ScopedMessagePipeHandle pipe1_;
   ScopedMessagePipeHandle pipe3_;
   std::string expected_text_reply_;
   bool got_response_;
 };
@@ skipping 170 matching lines @@
 
   PumpMessages();  // Yield for results.
 
   EXPECT_EQ(std::string("object1"), name1);
   EXPECT_EQ(std::string("object2"), name2);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo