| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.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 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "media/base/media.h" | 10 #include "media/base/media.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 #if defined(OS_ANDROID) | 69 #if defined(OS_ANDROID) |
| 70 // Register JNI bindings for android. | 70 // Register JNI bindings for android. |
| 71 JNIEnv* env = base::android::AttachCurrentThread(); | 71 JNIEnv* env = base::android::AttachCurrentThread(); |
| 72 // Needed for surface texture support. | 72 // Needed for surface texture support. |
| 73 ui::gl::android::RegisterJni(env); | 73 ui::gl::android::RegisterJni(env); |
| 74 media::RegisterJni(env); | 74 media::RegisterJni(env); |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 // Run this here instead of main() to ensure an AtExitManager is already | 77 // Run this here instead of main() to ensure an AtExitManager is already |
| 78 // present. | 78 // present. |
| 79 media::InitializeMediaLibraryForTesting(); | 79 media::InitializeMediaLibrary(); |
| 80 | 80 |
| 81 #ifdef V8_USE_EXTERNAL_STARTUP_DATA | 81 #ifdef V8_USE_EXTERNAL_STARTUP_DATA |
| 82 gin::V8Initializer::LoadV8Snapshot(); | 82 gin::V8Initializer::LoadV8Snapshot(); |
| 83 gin::V8Initializer::LoadV8Natives(); | 83 gin::V8Initializer::LoadV8Natives(); |
| 84 #endif | 84 #endif |
| 85 | 85 |
| 86 // Dummy task runner is initialized here because the blink::initialize creates | 86 // Dummy task runner is initialized here because the blink::initialize creates |
| 87 // IsolateHolder which needs the current task runner handle. There should be | 87 // IsolateHolder which needs the current task runner handle. There should be |
| 88 // no task posted to this task runner. | 88 // no task posted to this task runner. |
| 89 scoped_ptr<base::MessageLoop> message_loop; | 89 scoped_ptr<base::MessageLoop> message_loop; |
| 90 if (!base::MessageLoop::current()) | 90 if (!base::MessageLoop::current()) |
| 91 message_loop.reset(new base::MessageLoop()); | 91 message_loop.reset(new base::MessageLoop()); |
| 92 blink::initialize(blink_platform_support_.get()); | 92 blink::initialize(blink_platform_support_.get()); |
| 93 } | 93 } |
| 94 | 94 |
| 95 int main(int argc, char** argv) { | 95 int main(int argc, char** argv) { |
| 96 BlinkMediaTestSuite test_suite(argc, argv); | 96 BlinkMediaTestSuite test_suite(argc, argv); |
| 97 | 97 |
| 98 return base::LaunchUnitTests( | 98 return base::LaunchUnitTests( |
| 99 argc, argv, base::Bind(&BlinkMediaTestSuite::Run, | 99 argc, argv, base::Bind(&BlinkMediaTestSuite::Run, |
| 100 base::Unretained(&test_suite))); | 100 base::Unretained(&test_suite))); |
| 101 } | 101 } |
| OLD | NEW |