Migrated ChromeViewHostMsg_PageHasOSDD to Mojo.

chrome/browser/ui/search_engines/search_engine_tab_helper.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/ui/search_engines/search_engine_tab_helper.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
@@ skipping 54 matching lines @@
       (url.path().length() > 1)) {
     return base::string16();
   }
 
   return TemplateURL::GenerateKeyword(url);
 }
 
 void AssociateURLFetcherWithWebContents(content::WebContents* web_contents,
                                         net::URLFetcher* url_fetcher) {
   content::AssociateURLFetcherWithRenderFrame(
-      url_fetcher,
-      url::Origin(web_contents->GetURL()),
+      url_fetcher, url::Origin(web_contents->GetURL()),
       web_contents->GetRenderProcessHost()->GetID(),
       web_contents->GetMainFrame()->GetRoutingID());
 }
 
 }  // namespace
 
 SearchEngineTabHelper::~SearchEngineTabHelper() {
 }
 
 void SearchEngineTabHelper::DidFinishNavigation(
     content::NavigationHandle* handle) {
   GenerateKeywordIfNecessary(handle);
 }
 
-bool SearchEngineTabHelper::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(SearchEngineTabHelper, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageHasOSDD, OnPageHasOSDD)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-
-  return handled;
-}
-
-bool SearchEngineTabHelper::OnMessageReceived(
-    const IPC::Message& message,
-    content::RenderFrameHost* render_frame_host) {
-  return OnMessageReceived(message);
-}
-
 SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
+    : content::WebContentsObserver(web_contents),
+      osdd_handler_bindings_(web_contents, this) {
   DCHECK(web_contents);
 }
 
-void SearchEngineTabHelper::OnPageHasOSDD(
+void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
     const GURL& page_url,
     const GURL& osdd_url) {
   // Checks to see if we should generate a keyword based on the OSDD, and if
   // necessary uses TemplateURLFetcher to download the OSDD and create a
   // keyword.
 
+  // Only accept messages from the main frame.
+  if (osdd_handler_bindings_.GetCurrentTargetFrame() !=
+      web_contents()->GetMainFrame())

[dcheng, 2017/03/16 05:57:43]

Huh. Did we not check this in the past? I guess this is a nice improvement then
=)

+    return;
+
   // Make sure that the page is the current page and other basic checks.
   // When |page_url| has file: scheme, this method doesn't work because of
   // http://b/issue?id=863583. For that reason, this doesn't check and allow
   // urls referring to osdd urls with same schemes.
   if (!osdd_url.is_valid() || !osdd_url.SchemeIsHTTPOrHTTPS())
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   if (page_url != web_contents()->GetLastCommittedURL() ||
@@ skipping 88 matching lines @@
   if (current_favicon.is_valid()) {
     data.favicon_url = current_favicon;
   } else if (handle->GetReferrer().url.is_valid()) {
     data.favicon_url =
         TemplateURL::GenerateFaviconURL(handle->GetReferrer().url);
   }
   data.safe_for_autoreplace = true;
   data.input_encodings.push_back(handle->GetSearchableFormEncoding());
   url_service->Add(base::MakeUnique<TemplateURL>(data));
 }