diff options
author | jam <jam@chromium.org> | 2015-11-30 09:54:39 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-30 17:55:20 +0000 |
commit | bfab778c21d4cb4656dc03205662cddf84ee4ac7 (patch) | |
tree | f9fde7e58a012dbdb1565ea33c38d95220066d69 /ipc | |
parent | 6bbab2e51655e7383929305389734fe77e8217a0 (diff) | |
download | chromium_src-bfab778c21d4cb4656dc03205662cddf84ee4ac7.zip chromium_src-bfab778c21d4cb4656dc03205662cddf84ee4ac7.tar.gz chromium_src-bfab778c21d4cb4656dc03205662cddf84ee4ac7.tar.bz2 |
Remove SimpleBroker and instead use the production broker implementation in tests.
Now that we'll be using the broker for non-sandbox communication, all processes need to share state. This is better anyways to exercise the production code in tests.
BUG=561803
Review URL: https://codereview.chromium.org/1485573002
Cr-Commit-Position: refs/heads/master@{#362157}
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/mojo/run_all_unittests.cc | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/ipc/mojo/run_all_unittests.cc b/ipc/mojo/run_all_unittests.cc index 6382474..fd3c611 100644 --- a/ipc/mojo/run_all_unittests.cc +++ b/ipc/mojo/run_all_unittests.cc @@ -13,30 +13,14 @@ #include "base/test/test_file_util.h" #endif -namespace { - -class NoAtExitBaseTestSuite : public base::TestSuite { - public: - NoAtExitBaseTestSuite(int argc, char** argv) - : base::TestSuite(argc, argv, false) { - } -}; - -int RunTestSuite(int argc, char** argv) { - return NoAtExitBaseTestSuite(argc, argv).Run(); -} - -} // namespace - int main(int argc, char** argv) { - mojo::embedder::Init(); #if defined(OS_ANDROID) JNIEnv* env = base::android::AttachCurrentThread(); base::RegisterContentUriTestUtils(env); -#else - base::AtExitManager at_exit; #endif - return base::LaunchUnitTestsSerially(argc, - argv, - base::Bind(&RunTestSuite, argc, argv)); + base::TestSuite test_suite(argc, argv); + mojo::embedder::Init(); + return base::LaunchUnitTestsSerially( + argc, argv, + base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); } |