Reviewers: Ken Rockot
CL:
https://codereview.chromium.org/2112683002/Description:
Null-check ThreadTaskRunnerHandle::Get() before doing Connect() in BC::Init()
R=roc...@chromium.orgBUG=
Base URL:
https://chromium.googlesource.com/chromium/src.git@masterAffected files (+2, -1 lines):
M content/browser/browser_context.cc
Index: content/browser/browser_context.cc
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index 98c5ef6961da9bfe7f50804e4e28e8d8556524a1..b0251f2d41d5a9d4e79ff943724983281db0bf53 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -17,6 +17,7 @@
#include "base/lazy_instance.h"
#include "base/macros.h"
#include "base/rand_util.h"
+#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
#include "content/browser/download/download_manager_impl.h"
@@ -411,7 +412,7 @@ void BrowserContext::Initialize(
new base::SupportsUserData::Data);
MojoShellConnection* shell = MojoShellConnection::GetForProcess();
- if (shell) {
+ if (shell && base::ThreadTaskRunnerHandle::Get()) {
// NOTE: Many unit tests create a TestBrowserContext without initializing
// Mojo or the global Mojo shell connection.