Convert GetSearchProviderInstallState to Mojo

chrome/browser/search_engines/search_provider_install_state_impl.cc

Index: chrome/browser/search_engines/search_provider_install_state_impl.cc
diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc b/chrome/browser/search_engines/search_provider_install_state_impl.cc
similarity index 53%
rename from chrome/browser/search_engines/search_provider_install_state_message_filter.cc
rename to chrome/browser/search_engines/search_provider_install_state_impl.cc
index ccd32f4dcb5690316e8b538772a645ea67829686..5871149eedc2e1c791b51f0bc9fc94fcc4a81579 100644
--- a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc
+++ b/chrome/browser/search_engines/search_provider_install_state_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
+#include "chrome/browser/search_engines/search_provider_install_state_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -10,18 +10,18 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
-#include "chrome/common/render_messages.h"
+#include "chrome/common/search_provider.mojom.h"
+#include "content/public/browser/owned_interface.h"
 #include "content/public/browser/render_process_host.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
-SearchProviderInstallStateMessageFilter::
-SearchProviderInstallStateMessageFilter(
+SearchProviderInstallStateImpl::SearchProviderInstallStateImpl(
     int render_process_id,
     Profile* profile)
-    : BrowserMessageFilter(ChromeMsgStart),
-      provider_data_(TemplateURLServiceFactory::GetForProfile(profile),
+    : provider_data_(TemplateURLServiceFactory::GetForProfile(profile),
                      UIThreadSearchTermsData(profile).GoogleBaseURLValue(),
                      GoogleURLTrackerFactory::GetForProfile(profile),
                      content::RenderProcessHost::FromID(render_process_id)),
@@ -32,80 +32,73 @@ SearchProviderInstallStateMessageFilter(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
-bool SearchProviderInstallStateMessageFilter::OnMessageReceived(
-    const IPC::Message& message) {
+SearchProviderInstallStateImpl::~SearchProviderInstallStateImpl() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(SearchProviderInstallStateMessageFilter, message)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(
-        ChromeViewHostMsg_GetSearchProviderInstallState,
-        OnGetSearchProviderInstallState)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
 }
 
-SearchProviderInstallStateMessageFilter::
-~SearchProviderInstallStateMessageFilter() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+// Register the given interface impl. The impl is owned by the host. Messages
+// will be dispatched on |task_runner| (or on the default task runner if not
+// given). The impl will also be deleted on |task_runner|.
+template <typename InterfaceImpl>
+void InstallService2(

[yzshen1, 2016/07/21 15:42:38]

It seems this is not used anywhere?

[tibell, 2016/07/22 00:19:53]

Good catch.

Fixed in https://codereview.chromium.org/2169243002.

+    content::RenderProcessHost* host,
+    std::unique_ptr<InterfaceImpl> impl,
+    const scoped_refptr<base::SingleThreadTaskRunner>& task_runner = nullptr) {
+  host->AddOwnedInterface(std::move(impl), task_runner);
+}
+
+void SearchProviderInstallStateImpl::Bind(
+    chrome::mojom::SearchProviderInstallStateRequest request) {
+  binding_set_.AddBinding(this, std::move(request));
 }
 
-search_provider::InstallState
-SearchProviderInstallStateMessageFilter::GetSearchProviderInstallState(
+chrome::mojom::InstallState
+SearchProviderInstallStateImpl::GetSearchProviderInstallState(
     const GURL& page_location,
     const GURL& requested_host) {
   GURL requested_origin = requested_host.GetOrigin();
 
   // Do the security check before any others to avoid information leaks.
   if (page_location.GetOrigin() != requested_origin)
-    return search_provider::DENIED;
+    return chrome::mojom::InstallState::DENIED;
 
   // In incognito mode, no search information is exposed. (This check must be
   // done after the security check or else a web site can detect that the
   // user is in incognito mode just by doing a cross origin request.)
   if (is_off_the_record_)
-      return search_provider::NOT_INSTALLED;
+    return chrome::mojom::InstallState::NOT_INSTALLED;
 
   switch (provider_data_.GetInstallState(requested_origin)) {
     case SearchProviderInstallData::NOT_INSTALLED:
-      return search_provider::NOT_INSTALLED;
+      return chrome::mojom::InstallState::NOT_INSTALLED;
 
     case SearchProviderInstallData::INSTALLED_BUT_NOT_DEFAULT:
-      return search_provider::INSTALLED_BUT_NOT_DEFAULT;
+      return chrome::mojom::InstallState::INSTALLED_BUT_NOT_DEFAULT;
 
     case SearchProviderInstallData::INSTALLED_AS_DEFAULT:
-      return search_provider::INSTALLED_AS_DEFAULT;
+      return chrome::mojom::InstallState::INSTALLED_AS_DEFAULT;
   }
 
   NOTREACHED();
-  return search_provider::NOT_INSTALLED;
+  return chrome::mojom::InstallState::NOT_INSTALLED;
 }
 
-void
-SearchProviderInstallStateMessageFilter::OnGetSearchProviderInstallState(
+void SearchProviderInstallStateImpl::GetInstallState(
     const GURL& page_location,
     const GURL& requested_host,
-    IPC::Message* reply_msg) {
-  provider_data_.CallWhenLoaded(
-      base::Bind(
-          &SearchProviderInstallStateMessageFilter::
-          ReplyWithProviderInstallState,
-          weak_factory_.GetWeakPtr(),
-          page_location,
-          requested_host,
-          reply_msg));
+    const GetInstallStateCallback& callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  provider_data_.CallWhenLoaded(base::Bind(
+      &SearchProviderInstallStateImpl::ReplyWithProviderInstallState,
+      weak_factory_.GetWeakPtr(), page_location, requested_host, callback));
 }
 
-void SearchProviderInstallStateMessageFilter::ReplyWithProviderInstallState(
+void SearchProviderInstallStateImpl::ReplyWithProviderInstallState(
     const GURL& page_location,
     const GURL& requested_host,
-    IPC::Message* reply_msg) {
-  DCHECK(reply_msg);
-  search_provider::InstallState install_state =
+    const GetInstallStateCallback& callback) {
+  chrome::mojom::InstallState install_state =
       GetSearchProviderInstallState(page_location, requested_host);
 
-  ChromeViewHostMsg_GetSearchProviderInstallState::WriteReplyParams(
-      reply_msg,
-      install_state);
-  Send(reply_msg);
+  callback.Run(install_state);
 }