Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

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

 // Copyright 2015 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 <stdint.h>
 
 #include <map>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h"
 #include "mojo/shell/public/cpp/application_runner.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 
 namespace mojo {
 namespace test {
 namespace versioning {
 
 struct EmployeeInfo {
  public:
   EmployeeInfo() {}
 
   EmployeePtr employee;
   Array<uint8_t> finger_print;
 
  private:
-  MOJO_DISALLOW_COPY_AND_ASSIGN(EmployeeInfo);
+  DISALLOW_COPY_AND_ASSIGN(EmployeeInfo);
 };
 
 class HumanResourceDatabaseImpl : public HumanResourceDatabase {
  public:
   explicit HumanResourceDatabaseImpl(
       InterfaceRequest<HumanResourceDatabase> request)
       : strong_binding_(this, request.Pass()) {
     // Pretend that there is already some data in the system.
     EmployeeInfo* info = new EmployeeInfo();
     employees_[1] = info;
@@ skipping 77 matching lines @@
 }  // namespace versioning
 }  // namespace test
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle request) {
   mojo::ApplicationRunner runner(
       new mojo::test::versioning::HumanResourceSystemServer());
 
   return runner.Run(request);
 }