| 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" | |
| 11 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 12 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
| 13 #include "ui/mojo/init/ui_init.h" | 12 #include "ui/mojo/init/ui_init.h" |
| 14 | 13 |
| 14 #if defined(USE_CHROME_EDK) |
| 15 #include "mojo/edk/embedder/test_embedder.h" |
| 16 #else |
| 17 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" |
| 18 #endif |
| 19 |
| 15 #if defined(OS_ANDROID) | 20 #if defined(OS_ANDROID) |
| 16 #include "base/android/apk_assets.h" | 21 #include "base/android/apk_assets.h" |
| 17 #include "base/android/jni_android.h" | 22 #include "base/android/jni_android.h" |
| 18 #include "base/test/test_file_util.h" | 23 #include "base/test/test_file_util.h" |
| 19 #endif | 24 #endif |
| 20 | 25 |
| 21 namespace { | 26 namespace { |
| 22 | 27 |
| 23 class NoAtExitBaseTestSuite : public base::TestSuite { | 28 class NoAtExitBaseTestSuite : public base::TestSuite { |
| 24 public: | 29 public: |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 base::RegisterContentUriTestUtils(env); | 64 base::RegisterContentUriTestUtils(env); |
| 60 #else | 65 #else |
| 61 base::AtExitManager at_exit; | 66 base::AtExitManager at_exit; |
| 62 #endif | 67 #endif |
| 63 mojo::embedder::test::InitWithSimplePlatformSupport(); | 68 mojo::embedder::test::InitWithSimplePlatformSupport(); |
| 64 | 69 |
| 65 return base::LaunchUnitTests(argc, | 70 return base::LaunchUnitTests(argc, |
| 66 argv, | 71 argv, |
| 67 base::Bind(&RunTestSuite, argc, argv)); | 72 base::Bind(&RunTestSuite, argc, argv)); |
| 68 } | 73 } |
| OLD | NEW |