Simplify mojo_shell since it's now only used for Mandoline.

mojo/application/application_test_base_chromium.h

Index: mojo/application/application_test_base_chromium.h
diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h b/mojo/application/application_test_base_chromium.h
similarity index 86%
copy from third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
copy to mojo/application/application_test_base_chromium.h
index 10763be4bf36dcbb561ccb3a162a1f2335cbab4f..c050848ee73d17cff3778f8b6c04d075ce1a8cd2 100644
--- a/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
+++ b/mojo/application/application_test_base_chromium.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_
-#define MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_
+#ifndef MOJO_APPLICATION_APPLICATION_TEST_BASE_CHROMIUM_H_
+#define MOJO_APPLICATION_APPLICATION_TEST_BASE_CHROMIUM_H_
 
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/bindings/array.h"
@@ -18,9 +18,6 @@ class ApplicationImpl;
 
 namespace test {
 
-// Access the command line arguments passed to the application test.
-const Array<String>& Args();
-
 // Run all application tests. This must be called after the environment is
 // initialized, to support construction of a default run loop.
 MojoResult RunAllTests(MojoHandle application_request_handle);
@@ -59,4 +56,4 @@ class ApplicationTestBase : public testing::Test {
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_
+#endif  // MOJO_APPLICATION_APPLICATION_TEST_BASE_CHROMIUM_H_