Use loops directly in apptest main files.
Use mojo::RunLoop in application_test_main.cc
Use base::MessageLoop in application_test_main_chromium.cc
Avoid Environment's DefaultRunLoop abstraction.
This follows some code review feedback from:
https://codereview.chromium.org/710403002/
BUG=392646
TEST=apptests still build and run fine.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/718123002
diff --git a/mojo/public/cpp/application/lib/application_test_main.cc b/mojo/public/cpp/application/lib/application_test_main.cc
index 9b76dad..6cdfb0d 100644
--- a/mojo/public/cpp/application/lib/application_test_main.cc
+++ b/mojo/public/cpp/application/lib/application_test_main.cc
@@ -6,16 +6,18 @@
#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/environment.h"
#include "mojo/public/cpp/environment/logging.h"
#include "mojo/public/cpp/system/message_pipe.h"
+#include "mojo/public/cpp/utility/run_loop.h"
MojoResult MojoMain(MojoHandle shell_handle) {
// An Environment instance is needed to construct run loops.
mojo::Environment environment;
{
- // 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.
+ mojo::RunLoop run_loop;
// Construct an ApplicationImpl just for the GTEST commandline arguments.
// GTEST command line arguments are supported amid application arguments:
@@ -38,7 +40,6 @@
testing::InitGoogleTest(&argc, const_cast<char**>(&(argv[0])));
mojo::test::SetShellHandle(app.UnbindShell());
- mojo::Environment::DestroyDefaultRunLoop();
}
int result = RUN_ALL_TESTS();
