| Index: content/browser/browser_context.cc
|
| diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
|
| index 59b0047b06762270ccd31eb0b1abae02ed25d0d7..a10c749e1bbe172af30b4e892c703102dd4768d0 100644
|
| --- a/content/browser/browser_context.cc
|
| +++ b/content/browser/browser_context.cc
|
| @@ -473,12 +473,17 @@ BrowserContext* BrowserContext::GetBrowserContextForShellUserId(
|
| // static
|
| shell::Connector* BrowserContext::GetShellConnectorFor(
|
| BrowserContext* browser_context) {
|
| + MojoShellConnection* connection = GetMojoShellConnectionFor(browser_context);
|
| + return connection ? connection->GetConnector() : nullptr;
|
| +}
|
| +
|
| +// static
|
| +MojoShellConnection* BrowserContext::GetMojoShellConnectionFor(
|
| + BrowserContext* browser_context) {
|
| BrowserContextShellConnectionHolder* connection_holder =
|
| static_cast<BrowserContextShellConnectionHolder*>(
|
| browser_context->GetUserData(kMojoShellConnection));
|
| - if (!connection_holder)
|
| - return nullptr;
|
| - return connection_holder->shell_connection()->GetConnector();
|
| + return connection_holder ? connection_holder->shell_connection() : nullptr;
|
| }
|
|
|
| BrowserContext::~BrowserContext() {
|
|
|