Use loops directly in apptest main files.

mojo/application/application_test_main_chromium.cc

Index: mojo/application/application_test_main_chromium.cc
diff --git a/mojo/application/application_test_main_chromium.cc b/mojo/application/application_test_main_chromium.cc
index d84e80eb60b34678239af7d1c5378c6c9a7308a2..f5b8bfb17661fb618d34e8c3f354fca8afe64228 100644
--- a/mojo/application/application_test_main_chromium.cc
+++ b/mojo/application/application_test_main_chromium.cc
@@ -3,11 +3,12 @@
 // found in the LICENSE file.
 
 #include "base/at_exit.h"
+#include "base/logging.h"
+#include "base/message_loop/message_loop.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/public/cpp/environment/logging.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
@@ -15,22 +16,21 @@ MojoResult MojoMain(MojoHandle shell_handle) {
   base::AtExitManager at_exit;
 
   {
-    // This RunLoop is used for init, and then destroyed before running tests.
-    mojo::Environment::InstantiateDefaultRunLoop();
+    // This loop is used for init, and then destroyed before running tests.
+    base::MessageLoop message_loop;
 
     // Construct an ApplicationImpl just for the GTEST commandline arguments.
     // GTEST command line arguments are supported amid application arguments:
     // $ mojo_shell 'mojo:example_apptests arg1 --gtest_filter=foo arg2'
     mojo::ApplicationDelegate dummy_application_delegate;
     mojo::ApplicationImpl app(&dummy_application_delegate, shell_handle);
-    MOJO_CHECK(app.WaitForInitialize());
+    CHECK(app.WaitForInitialize());
 
     // InitGoogleTest expects (argc + 1) elements, including a terminating NULL.
     // It also removes GTEST arguments from |argv| and updates the |argc| count.
     // TODO(msw): Provide tests access to these actual command line arguments.
     const std::vector<std::string>& args = app.args();
-    MOJO_CHECK(args.size() <
-               static_cast<size_t>(std::numeric_limits<int>::max()));
+    CHECK_LT(args.size(), static_cast<size_t>(std::numeric_limits<int>::max()));
     int argc = static_cast<int>(args.size());
     std::vector<const char*> argv(argc + 1);
     for (int i = 0; i < argc; ++i)
@@ -39,14 +39,13 @@ MojoResult MojoMain(MojoHandle shell_handle) {
 
     testing::InitGoogleTest(&argc, const_cast<char**>(&(argv[0])));
     mojo::test::SetShellHandle(app.UnbindShell());
-    mojo::Environment::DestroyDefaultRunLoop();
   }
 
   int result = RUN_ALL_TESTS();
 
   shell_handle = mojo::test::PassShellHandle().release().value();
   MojoResult close_result = MojoClose(shell_handle);
-  MOJO_CHECK(close_result == MOJO_RESULT_OK);
+  CHECK_EQ(close_result, MOJO_RESULT_OK);
 
   return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN;
 }