Index: chrome/browser/search_engines/search_provider_install_state_message_filter.cc |
diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc |
index ccd32f4dcb5690316e8b538772a645ea67829686..77d07eb900372b3b73b621e33427fbb0b24400db 100644 |
--- a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc |
+++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc |
@@ -10,6 +10,7 @@ |
#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.mojom.h" |
#include "chrome/common/render_messages.h" |
#include "content/public/browser/render_process_host.h" |
#include "url/gurl.h" |
@@ -20,8 +21,7 @@ SearchProviderInstallStateMessageFilter:: |
SearchProviderInstallStateMessageFilter( |
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,19 +32,6 @@ SearchProviderInstallStateMessageFilter( |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
} |
-bool SearchProviderInstallStateMessageFilter::OnMessageReceived( |
- const IPC::Message& message) { |
- 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); |
@@ -81,11 +68,20 @@ SearchProviderInstallStateMessageFilter::GetSearchProviderInstallState( |
return search_provider::NOT_INSTALLED; |
} |
+void SearchProviderInstallStateMessageFilter::Bind( |
+ mojom::SearchProviderInstallStateRequest request) { |
+ binding_set_.AddBinding(this, std::move(request)); |
+} |
+ |
+const char SearchProviderInstallStateMessageFilter::kRenderProcessHostKey[] = |
+ "kRenderProcessHostKey"; |
+ |
void |
-SearchProviderInstallStateMessageFilter::OnGetSearchProviderInstallState( |
+SearchProviderInstallStateMessageFilter::GetInstallState( |
const GURL& page_location, |
const GURL& requested_host, |
- IPC::Message* reply_msg) { |
+ const mojo::Callback<void(search_provider::InstallState)>& callback) { |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
provider_data_.CallWhenLoaded( |
base::Bind( |
&SearchProviderInstallStateMessageFilter:: |
@@ -93,19 +89,22 @@ SearchProviderInstallStateMessageFilter::OnGetSearchProviderInstallState( |
weak_factory_.GetWeakPtr(), |
page_location, |
requested_host, |
- reply_msg)); |
+ callback)); |
} |
void SearchProviderInstallStateMessageFilter::ReplyWithProviderInstallState( |
const GURL& page_location, |
const GURL& requested_host, |
- IPC::Message* reply_msg) { |
- DCHECK(reply_msg); |
+ const mojo::Callback<void(search_provider::InstallState)>& callback) { |
search_provider::InstallState install_state = |
GetSearchProviderInstallState(page_location, requested_host); |
- ChromeViewHostMsg_GetSearchProviderInstallState::WriteReplyParams( |
- reply_msg, |
- install_state); |
- Send(reply_msg); |
+ callback.Run(install_state); |
} |
+ |
+SearchProviderInstallStateMessageFilterAdapter:: |
+SearchProviderInstallStateMessageFilterAdapter( |
+ SearchProviderInstallStateMessageFilter* filter) : ptr_(filter) {} |
+ |
+SearchProviderInstallStateMessageFilterAdapter:: |
+~SearchProviderInstallStateMessageFilterAdapter() {} |