Move interface registration to OnConnect in RPH

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 2755 matching lines @@
   while (tokenizer.GetNext()) {
     if (tokenizer.token() == mime_type)
       return true;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 void ChromeContentBrowserClient::ExposeInterfacesToRenderer(
-    shell::InterfaceRegistry* registry,
-    content::RenderProcessHost* render_process_host) {
-  registry->AddInterface(
+    shell::Connection* connection) {
+  connection->GetInterfaceRegistry()->AddInterface(
+      base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create),
+      content::BrowserThread::GetTaskRunnerForThread(
+          content::BrowserThread::UI));
+  connection->GetInterfaceRegistry()->AddInterface(
       base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create));
 
 #if defined(OS_CHROMEOS)
-  registry->AddInterface<metrics::mojom::LeakDetector>(
-      base::Bind(&metrics::LeakDetectorRemoteController::Create));
+  connection->GetInterfaceRegistry()->
+      AddInterface<metrics::mojom::LeakDetector>(
+          base::Bind(&metrics::LeakDetectorRemoteController::Create));
 #endif
 }
 
 void ChromeContentBrowserClient::ExposeInterfacesToMediaService(
     shell::InterfaceRegistry* registry,
     content::RenderFrameHost* render_frame_host) {
 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
 #if defined(OS_CHROMEOS)
   registry->AddInterface(
       base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
@@ skipping 263 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)