Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

mojo/shell/public/cpp/application_test_base.h

Index: mojo/shell/public/cpp/application_test_base.h
diff --git a/mojo/shell/public/cpp/application_test_base.h b/mojo/shell/public/cpp/application_test_base.h
index 764770a4714d50130116c84cbeeae0da2fd5206c..91160df0fbb65944aab5f29e12d62ebcbfa57ef2 100644
--- a/mojo/shell/public/cpp/application_test_base.h
+++ b/mojo/shell/public/cpp/application_test_base.h
@@ -49,7 +49,7 @@ class TestHelper {
   uint32_t instance_id_;
   uint32_t userid_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(TestHelper);
+  DISALLOW_COPY_AND_ASSIGN(TestHelper);
 };
 
 // A GTEST base class for application testing executed in mojo_shell.
@@ -89,7 +89,7 @@ class ApplicationTestBase : public testing::Test {
  private:
   scoped_ptr<TestHelper> test_helper_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationTestBase);
+  DISALLOW_COPY_AND_ASSIGN(ApplicationTestBase);
 };
 
 }  // namespace test