Move interface registration to OnConnect in RPH

content/browser/browser_context.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/browser_context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <limits>
@@ skipping 455 matching lines @@
 // static
 BrowserContext* BrowserContext::GetBrowserContextForShellUserId(
     const std::string& user_id) {
   auto it = g_user_id_to_context.Get().find(user_id);
   return it != g_user_id_to_context.Get().end() ? it->second : nullptr;
 }
 
 // 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->shell_connection();
 }
 
 BrowserContext::~BrowserContext() {
   CHECK(GetUserData(kMojoWasInitialized))
       << "Attempting to destroy a BrowserContext that never called "
       << "Initialize()";
 
   RemoveBrowserContextFromUserIdMap(this);
 
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
 }  // namespace content