Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

mojo/public/cpp/bindings/lib/control_message_proxy.cc

Index: mojo/public/cpp/bindings/lib/control_message_proxy.cc
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
index 6c5daa917389645f97bfd6a2b46261fe8db7e2d2..d45035504dca5fc29bb2adcec0d18c982fc8422f 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -28,7 +28,7 @@ class RunResponseForwardToCallback : public MessageReceiver {
 
  private:
   RunCallback callback_;
-  MOJO_DISALLOW_COPY_AND_ASSIGN(RunResponseForwardToCallback);
+  DISALLOW_COPY_AND_ASSIGN(RunResponseForwardToCallback);
 };
 
 bool RunResponseForwardToCallback::Accept(Message* message) {
@@ -77,7 +77,7 @@ void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver,
   Serialize_(std::move(params_ptr), builder.buffer(), &params, nullptr);
   params->EncodePointersAndHandles(builder.message()->mutable_handles());
   bool ok = receiver->Accept(builder.message());
-  MOJO_ALLOW_UNUSED_LOCAL(ok);
+  ALLOW_UNUSED_LOCAL(ok);
 }
 
 }  // namespace