| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/test/launcher/unit_test_launcher.h" | 8 #include "base/test/launcher/unit_test_launcher.h" |
| 9 #include "base/test/test_suite.h" | 9 #include "base/test/test_suite.h" |
| 10 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" | 10 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
| 11 #include "ui/base/resource/resource_bundle.h" | 11 #include "ui/base/resource/resource_bundle.h" |
| 12 #include "ui/gfx/geometry/size.h" | 12 #include "ui/gfx/geometry/size.h" |
| 13 #include "ui/mojo/init/ui_init.h" | 13 #include "ui/mojo/init/ui_init.h" |
| 14 | 14 |
| 15 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
| 16 #include "base/android/apk_assets.h" | 16 #include "base/android/apk_assets.h" |
| 17 #include "base/android/jni_android.h" | 17 #include "base/android/jni_android.h" |
| 18 #include "base/test/test_file_util.h" | 18 #include "base/test/test_file_util.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 | 53 |
| 54 } // namespace | 54 } // namespace |
| 55 | 55 |
| 56 int main(int argc, char** argv) { | 56 int main(int argc, char** argv) { |
| 57 #if defined(OS_ANDROID) | 57 #if defined(OS_ANDROID) |
| 58 JNIEnv* env = base::android::AttachCurrentThread(); | 58 JNIEnv* env = base::android::AttachCurrentThread(); |
| 59 base::RegisterContentUriTestUtils(env); | 59 base::RegisterContentUriTestUtils(env); |
| 60 #else | 60 #else |
| 61 base::AtExitManager at_exit; | 61 base::AtExitManager at_exit; |
| 62 #endif | 62 #endif |
| 63 mojo::embedder::test::InitWithSimplePlatformSupport(); | 63 mojo::embedder::Init(); |
| 64 | 64 |
| 65 return base::LaunchUnitTests(argc, | 65 return base::LaunchUnitTests(argc, |
| 66 argv, | 66 argv, |
| 67 base::Bind(&RunTestSuite, argc, argv)); | 67 base::Bind(&RunTestSuite, argc, argv)); |
| 68 } | 68 } |
| OLD | NEW |