Null-check ThreadTaskRunnerHandle::Get() before doing Connect() in BC::Init() (issue 2112683002 by ben@chromium.org)

6 views
Skip to first unread message

b...@chromium.org

unread,
Jun 29, 2016, 4:57:13 PM6/29/16
to roc...@chromium.org, chromium...@chromium.org, dari...@chromium.org, j...@chromium.org
Reviewers: Ken Rockot
CL: https://codereview.chromium.org/2112683002/

Description:
Null-check ThreadTaskRunnerHandle::Get() before doing Connect() in BC::Init()

R=roc...@chromium.org
BUG=

Base URL: https://chromium.googlesource.com/chromium/src.git@master

Affected 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.



roc...@chromium.org

unread,
Jun 29, 2016, 5:09:23 PM6/29/16
to b...@chromium.org, chromium...@chromium.org, dari...@chromium.org, j...@chromium.org
Oof. A little unfortunate, but seems legit enough for me.

https://codereview.chromium.org/2112683002/

roc...@chromium.org

unread,
Jun 29, 2016, 5:09:29 PM6/29/16
to b...@chromium.org, chromium...@chromium.org, dari...@chromium.org, j...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 29, 2016, 5:17:37 PM6/29/16
to b...@chromium.org, roc...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dari...@chromium.org, j...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 29, 2016, 6:24:55 PM6/29/16
to b...@chromium.org, roc...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dari...@chromium.org, j...@chromium.org
Committed patchset #1 (id:1)

https://codereview.chromium.org/2112683002/

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 29, 2016, 6:26:02 PM6/29/16
to b...@chromium.org, roc...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dari...@chromium.org, j...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 29, 2016, 6:27:41 PM6/29/16
to b...@chromium.org, roc...@chromium.org, commi...@chromium.org, chromium...@chromium.org, dari...@chromium.org, j...@chromium.org
Patchset 1 (id:??) landed as
https://crrev.com/21a34c257e212c729c91dedb4dbaf1da2369e594
Cr-Commit-Position: refs/heads/master@{#402954}

https://codereview.chromium.org/2112683002/
Reply all
Reply to author
Forward
0 new messages