| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/test/launcher/unit_test_launcher.h" | 9 #include "base/test/launcher/unit_test_launcher.h" |
| 10 #include "base/test/test_suite.h" | 10 #include "base/test/test_suite.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 gin::V8Initializer::LoadV8Snapshot(); | 113 gin::V8Initializer::LoadV8Snapshot(); |
| 114 gin::V8Initializer::LoadV8Natives(); | 114 gin::V8Initializer::LoadV8Natives(); |
| 115 #endif | 115 #endif |
| 116 | 116 |
| 117 // Dummy task runner is initialized here because the blink::initialize creates | 117 // Dummy task runner is initialized here because the blink::initialize creates |
| 118 // IsolateHolder which needs the current task runner handle. There should be | 118 // IsolateHolder which needs the current task runner handle. There should be |
| 119 // no task posted to this task runner. | 119 // no task posted to this task runner. |
| 120 std::unique_ptr<base::MessageLoop> message_loop; | 120 std::unique_ptr<base::MessageLoop> message_loop; |
| 121 if (!base::MessageLoop::current()) | 121 if (!base::MessageLoop::current()) |
| 122 message_loop.reset(new base::MessageLoop()); | 122 message_loop.reset(new base::MessageLoop()); |
| 123 blink::initialize(blink_platform_support_.get()); | 123 blink::Platform::initialize(blink_platform_support_.get()); |
| 124 blink::initialize(); |
| 124 } | 125 } |
| 125 | 126 |
| 126 int main(int argc, char** argv) { | 127 int main(int argc, char** argv) { |
| 127 BlinkMediaTestSuite test_suite(argc, argv); | 128 BlinkMediaTestSuite test_suite(argc, argv); |
| 128 | 129 |
| 129 return base::LaunchUnitTests( | 130 return base::LaunchUnitTests( |
| 130 argc, argv, base::Bind(&BlinkMediaTestSuite::Run, | 131 argc, argv, base::Bind(&BlinkMediaTestSuite::Run, |
| 131 base::Unretained(&test_suite))); | 132 base::Unretained(&test_suite))); |
| 132 } | 133 } |
| OLD | NEW |