Chromium Code Reviews| Index: components/nacl/loader/nonsfi/run_all_unittests.cc |
| diff --git a/ios/chrome/test/run_all_unittests.cc b/components/nacl/loader/nonsfi/run_all_unittests.cc |
| similarity index 55% |
| copy from ios/chrome/test/run_all_unittests.cc |
| copy to components/nacl/loader/nonsfi/run_all_unittests.cc |
| index f7c0f955d8e9fbe1f9bc37b88ffd60130537da17..bbc2a028250c0160166b11a70dfa1e566a020084 100644 |
| --- a/ios/chrome/test/run_all_unittests.cc |
| +++ b/components/nacl/loader/nonsfi/run_all_unittests.cc |
| @@ -2,13 +2,13 @@ |
| // 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/at_exit.h" |
| #include "base/test/launcher/unit_test_launcher.h" |
| -#include "ios/chrome/test/ios_chrome_unit_test_suite.h" |
| +#include "testing/gtest/include/gtest/gtest.h" |
| int main(int argc, char** argv) { |
| - IOSChromeUnitTestSuite test_suite(argc, argv); |
| + base::AtExitManager at_exit; |
| + testing::InitGoogleTest(&argc, argv); |
| return base::LaunchUnitTests( |
| - argc, argv, |
| - base::Bind(&IOSChromeUnitTestSuite::Run, base::Unretained(&test_suite))); |
| + argc, argv, base::Bind(&RUN_ALL_TESTS)); |
|
Paweł Hajdan Jr.
2015/06/02 10:37:36
It seems a little bit dangerous to apply & directl
hidehiko
2015/06/02 14:55:20
RUN_ALL_TESTS is a function (though, indeed, it lo
Paweł Hajdan Jr.
2015/06/02 15:41:38
Oh, indeed. Still, it looks like a macro and was a
hidehiko
2015/06/02 18:34:01
Hmm, ok. Done.
|
| } |