Chromium Code Reviews| Index: third_party/WebKit/Source/web/WebKit.cpp |
| diff --git a/third_party/WebKit/Source/web/WebKit.cpp b/third_party/WebKit/Source/web/WebKit.cpp |
| index f32df4dfb71b7c477d397c31330b30e5a1b087a8..384d9adbe1f8645d646dd613ab2f1f0646363537 100644 |
| --- a/third_party/WebKit/Source/web/WebKit.cpp |
| +++ b/third_party/WebKit/Source/web/WebKit.cpp |
| @@ -82,6 +82,12 @@ void initialize(Platform* platform) { |
| modulesInitializer().initialize(); |
| + // Some unit tests may have no message loop ready, so we can't initialize the |
| + // mojo stuff here. They can initialize those mojo stuff they're interested in |
| + // later after they got a message loop ready. |
| + if (Platform::isMessageLoopReady()) |
| + modulesInitializer().initializeMojo(); |
|
haraken
2016/10/26 11:21:59
Can we move this into modulesInitializer().initial
leonhsl(Using Gerrit)
2016/10/26 11:45:48
Acknowledged.
leonhsl(Using Gerrit)
2016/10/27 05:01:27
Done.
|
| + |
| // currentThread is null if we are running on a thread without a message loop. |
| if (WebThread* currentThread = platform->currentThread()) { |
| DCHECK(!s_endOfTaskRunner); |