Convert GetSearchProviderInstallState to Mojo

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 930 matching lines @@
   net::URLRequestContextGetter* context =
       host->GetStoragePartition()->GetURLRequestContext();
 
   host->AddFilter(new ChromeRenderMessageFilter(id, profile));
 #if defined(ENABLE_EXTENSIONS)
   host->AddFilter(new cast::CastTransportHostFilter);
 #endif
 #if defined(ENABLE_PRINTING)
   host->AddFilter(new printing::PrintingMessageFilter(id, profile));
 #endif
-  host->AddFilter(new SearchProviderInstallStateMessageFilter(id, profile));
+  auto* search_provider = new SearchProviderInstallStateMessageFilterAdapter(
+        new SearchProviderInstallStateMessageFilter(id, profile));
+  host->GetServiceRegistry()->AddService<mojom::SearchProviderInstallState>(
+      base::Bind(&SearchProviderInstallStateMessageFilter::Bind,
+                 base::Unretained(search_provider->Get())),
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
+  host->SetUserData(
+      SearchProviderInstallStateMessageFilter::kRenderProcessHostKey,
+      search_provider);
 #if defined(ENABLE_SPELLCHECK)
   host->AddFilter(new SpellCheckMessageFilter(id));
 #endif
 #if defined(USE_BROWSER_SPELLCHECKER)
   host->AddFilter(new SpellCheckMessageFilterPlatform(id));
 #endif
   host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context));
   host->AddFilter(new prerender::PrerenderMessageFilter(id, profile));
   host->AddFilter(new TtsMessageFilter(host->GetBrowserContext()));
 #if defined(ENABLE_WEBRTC)
@@ skipping 1753 matching lines @@
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 void ChromeContentBrowserClient::RegisterRenderProcessMojoServices(
     content::ServiceRegistry* registry,
     content::RenderProcessHost* render_process_host) {
   registry->AddService(
       base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create));
+  registry->AddService(
+      base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create));

[Sam McNally, 2016/06/20 01:27:11]

Remove.

[tibell, 2016/06/20 03:19:55]

Done.

 }
 
 void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
     content::ServiceRegistry* registry,
     content::RenderFrameHost* render_frame_host) {
 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
 #if defined(OS_CHROMEOS)
   registry->AddService(
       base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
                  render_frame_host));
@@ skipping 224 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)