Index: media/blink/run_all_unittests.cc |
diff --git a/media/blink/run_all_unittests.cc b/media/blink/run_all_unittests.cc |
index 5b0b6df4d7bd935629d83e775786ed13eff51b39..799e1cdda4f30249eb13049a824b2baaff18ef7a 100644 |
--- a/media/blink/run_all_unittests.cc |
+++ b/media/blink/run_all_unittests.cc |
@@ -20,6 +20,10 @@ |
#include "media/base/android/media_jni_registrar.h" |
#endif |
+#if !defined(OS_IOS) |
+#include "mojo/edk/embedder/embedder.h" |
+#endif |
+ |
#ifdef V8_USE_EXTERNAL_STARTUP_DATA |
#include "gin/v8_initializer.h" |
#endif |
@@ -82,6 +86,10 @@ void BlinkMediaTestSuite::Initialize() { |
gin::V8Initializer::LoadV8Natives(); |
#endif |
+// Initialize mojo firstly to enable Blink initialization use it. |
blundell
2016/10/18 12:32:11
("to use" on all of these comments throughout this
leonhsl(Using Gerrit)
2016/10/18 14:34:48
Acknowledged.
leonhsl(Using Gerrit)
2016/10/19 08:47:23
Done.
|
+#if !defined(OS_IOS) |
+ mojo::edk::Init(); |
+#endif |
// Dummy task runner is initialized here because the blink::initialize creates |
// IsolateHolder which needs the current task runner handle. There should be |
// no task posted to this task runner. |