Index: mojo/common/test/run_all_unittests.cc |
diff --git a/mojo/shell/test/run_all_unittests.cc b/mojo/common/test/run_all_unittests.cc |
similarity index 51% |
rename from mojo/shell/test/run_all_unittests.cc |
rename to mojo/common/test/run_all_unittests.cc |
index c36dc75afd33500a6dec58c571c226bfe0ca0b10..dc1990a918bbe3207951e9caa1a08417183f4f2b 100644 |
--- a/mojo/shell/test/run_all_unittests.cc |
+++ b/mojo/common/test/run_all_unittests.cc |
@@ -7,24 +7,14 @@ |
#include "base/compiler_specific.h" |
#include "base/test/launcher/unit_test_launcher.h" |
#include "base/test/test_suite.h" |
-#include "mojo/shell/context.h" |
- |
-class ShellTestSuite : public base::TestSuite { |
- public: |
- ShellTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} |
- |
- private: |
- base::MessageLoop message_loop_; |
- // Context is currently a singleton and requires a MessageLoop. |
- mojo::shell::Context context_; |
- |
- DISALLOW_COPY_AND_ASSIGN(ShellTestSuite); |
-}; |
+#include "mojo/system/core_impl.h" |
int main(int argc, char** argv) { |
- ShellTestSuite test_suite(argc, argv); |
+ base::TestSuite test_suite(argc, argv); |
+ |
+ mojo::system::CoreImpl::Init(); |
return base::LaunchUnitTests( |
- argc, argv, base::Bind(&ShellTestSuite::Run, |
+ argc, argv, base::Bind(&base::TestSuite::Run, |
base::Unretained(&test_suite))); |
} |