Chromium Code Reviews| Index: ui/events/run_all_unittests.cc |
| diff --git a/ipc/run_all_unittests.cc b/ui/events/run_all_unittests.cc |
| similarity index 77% |
| copy from ipc/run_all_unittests.cc |
| copy to ui/events/run_all_unittests.cc |
| index 5f9cc16755f7f53d5e6b893b72e185a3be0c75cd..21ee4b39dd230b6182ebd6f24d9ca6b013e4783f 100644 |
| --- a/ipc/run_all_unittests.cc |
| +++ b/ui/events/run_all_unittests.cc |
| @@ -1,10 +1,9 @@ |
| -// Copyright 2013 The Chromium Authors. All rights reserved. |
| +// Copyright 2016 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| #include "base/bind.h" |
| #include "base/test/launcher/unit_test_launcher.h" |
| -#include "base/test/multiprocess_test.h" |
| #include "base/test/test_suite.h" |
| #include "build/build_config.h" |
| @@ -13,14 +12,21 @@ |
| #include "base/test/test_file_util.h" |
| #endif |
| +#if !defined(OS_IOS) |
| +#include "mojo/edk/embedder/embedder.h" // nogncheck |
| +#endif |
| + |
| int main(int argc, char** argv) { |
| #if defined(OS_ANDROID) |
| - base::InitAndroidMultiProcessTestHelper(main); |
| - |
| JNIEnv* env = base::android::AttachCurrentThread(); |
| base::RegisterContentUriTestUtils(env); |
| #endif |
| base::TestSuite test_suite(argc, argv); |
| + |
| +#if !defined(OS_IOS) |
| + mojo::edk::Init(); |
| +#endif |
|
sadrul
2016/06/06 16:20:13
Looks like //ios/web/test/run_all_unittests.cc cal
Fady Samuel
2016/06/06 18:00:23
I got rid of this file.
|
| + |
| return base::LaunchUnitTests( |
| argc, argv, |
| base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |