OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/test/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" |
8 #include "base/test/test_discardable_memory_allocator.h" | 8 #include "base/test/test_discardable_memory_allocator.h" |
9 #include "base/test/test_suite.h" | 9 #include "base/test/test_suite.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
11 #include "media/base/fake_media_resources.h" | 11 #include "media/base/fake_media_resources.h" |
12 #include "media/base/media.h" | 12 #include "media/base/media.h" |
13 #include "media/base/media_switches.h" | 13 #include "media/base/media_switches.h" |
| 14 #include "mojo/edk/embedder/embedder.h" |
14 | 15 |
15 #if defined(OS_ANDROID) | 16 #if defined(OS_ANDROID) |
16 #include "base/android/jni_android.h" | 17 #include "base/android/jni_android.h" |
17 #include "media/base/android/media_codec_util.h" | 18 #include "media/base/android/media_codec_util.h" |
18 #include "media/base/android/media_jni_registrar.h" | 19 #include "media/base/android/media_jni_registrar.h" |
19 #include "ui/gl/android/gl_jni_registrar.h" | 20 #include "ui/gl/android/gl_jni_registrar.h" |
20 #endif | 21 #endif |
21 | 22 |
22 class TestSuiteNoAtExit : public base::TestSuite { | 23 class TestSuiteNoAtExit : public base::TestSuite { |
23 public: | 24 public: |
(...skipping 27 matching lines...) Expand all Loading... |
51 | 52 |
52 // Run this here instead of main() to ensure an AtExitManager is already | 53 // Run this here instead of main() to ensure an AtExitManager is already |
53 // present. | 54 // present. |
54 media::InitializeMediaLibrary(); | 55 media::InitializeMediaLibrary(); |
55 media::SetUpFakeMediaResources(); | 56 media::SetUpFakeMediaResources(); |
56 | 57 |
57 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); | 58 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); |
58 } | 59 } |
59 | 60 |
60 int main(int argc, char** argv) { | 61 int main(int argc, char** argv) { |
| 62 mojo::edk::Init(); |
61 TestSuiteNoAtExit test_suite(argc, argv); | 63 TestSuiteNoAtExit test_suite(argc, argv); |
62 | 64 |
63 return base::LaunchUnitTests( | 65 return base::LaunchUnitTests( |
64 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, | 66 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, |
65 base::Unretained(&test_suite))); | 67 base::Unretained(&test_suite))); |
66 } | 68 } |
OLD | NEW |