Migrated ChromeViewHostMsg_PageHasOSDD to Mojo.

chrome/browser/ui/search_engines/search_engine_tab_helper.h

Index: chrome/browser/ui/search_engines/search_engine_tab_helper.h
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.h b/chrome/browser/ui/search_engines/search_engine_tab_helper.h
index 2df1a4ae02cb4faeabae9abeb401bd870b30a644..346533ae6398419123acee4887ba8d2643300636 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.h
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.h
@@ -9,34 +9,42 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
+#include "chrome/common/osdd_handler.mojom.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
+#include "mojo/public/cpp/bindings/binding.h"
 
 // Per-tab search engine manager. Handles dealing search engine processing
 // functionality.
 class SearchEngineTabHelper
     : public content::WebContentsObserver,
-      public content::WebContentsUserData<SearchEngineTabHelper> {
+      public content::WebContentsUserData<SearchEngineTabHelper>,
+      public chrome::mojom::OSDDHandler {
  public:
+  SearchEngineTabHelper();

[Sam McNally, 2017/03/15 00:38:48]

Is this necessary?

[martis, 2017/03/15 05:00:56]

I believe so - I've introduced a non-default constructor. 

[Sam McNally, 2017/03/15 05:55:15]

The non-default constructor was there before. I don't think you need this.

   ~SearchEngineTabHelper() override;
 
   // content::WebContentsObserver overrides.
+  void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
   void DidFinishNavigation(content::NavigationHandle* handle) override;
 
-  bool OnMessageReceived(const IPC::Message& message) override;
-  bool OnMessageReceived(const IPC::Message& message,
-                         content::RenderFrameHost* rfh) override;
-
  private:
   explicit SearchEngineTabHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<SearchEngineTabHelper>;
 
-  // Handles when a page specifies an OSDD (OpenSearch Description Document).
-  void OnPageHasOSDD(const GURL& page_url, const GURL& osdd_url);
+  // chrome::mojom::OSDDHandler overrides.
+  void OnPageHasOSDD(const GURL& page_url, const GURL& osdd_url) override;
+
+  // Binds the given request to this object.
+  void OnOSDDHandlerRequest(chrome::mojom::OSDDHandlerRequest request);
 
   // If params has a searchable form, this tries to create a new keyword.
   void GenerateKeywordIfNecessary(content::NavigationHandle* handle);
 
+  mojo::Binding<chrome::mojom::OSDDHandler> osdd_handler_binding_;

[Sam McNally, 2017/03/15 00:38:48]

A mojo::Binding only supports a single connection; mojo::BindingSet supports
multiple connections, but in this case you want a
content::WebContentsFrameBindingSet<chrome::mojom::OSDDHandler>. That supports
multiple connections like a BindingSet, but also handles interface registration.
You'll want to add a check similar to the one in
https://cs.chromium.org/chromium/src/content/public/browser/web_contents_bind...
to only accept messages from the main frame.

You'll need to use GetRemoteAssociatedInterfaces() on the renderer side since
WebContentsFrameBindingSet uses an associated binding.

[martis, 2017/03/15 05:00:56]

Done. I removed the WeakPtr (based on other uses of WebContentsFrameBindingSet);
will that work?

+
+  base::WeakPtrFactory<SearchEngineTabHelper> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(SearchEngineTabHelper);
 };