| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/test/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" |
| 8 #include "base/test/test_suite.h" | 8 #include "base/test/test_suite.h" |
| 9 | 9 |
| 10 #if defined(OS_ANDROID) | 10 #if defined(OS_ANDROID) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 int RunTestSuite(int argc, char** argv) { | 24 int RunTestSuite(int argc, char** argv) { |
| 25 return NoAtExitBaseTestSuite(argc, argv).Run(); | 25 return NoAtExitBaseTestSuite(argc, argv).Run(); |
| 26 } | 26 } |
| 27 | 27 |
| 28 } // namespace | 28 } // namespace |
| 29 | 29 |
| 30 int main(int argc, char** argv) { | 30 int main(int argc, char** argv) { |
| 31 #if defined(OS_ANDROID) | 31 #if defined(OS_ANDROID) |
| 32 JNIEnv* env = base::android::AttachCurrentThread(); | 32 JNIEnv* env = base::android::AttachCurrentThread(); |
| 33 file_util::RegisterContentUriTestUtils(env); | 33 base::RegisterContentUriTestUtils(env); |
| 34 #else | 34 #else |
| 35 base::AtExitManager at_exit; | 35 base::AtExitManager at_exit; |
| 36 #endif | 36 #endif |
| 37 return base::LaunchUnitTestsSerially(argc, | 37 return base::LaunchUnitTestsSerially(argc, |
| 38 argv, | 38 argv, |
| 39 base::Bind(&RunTestSuite, argc, argv)); | 39 base::Bind(&RunTestSuite, argc, argv)); |
| 40 } | 40 } |
| OLD | NEW |