Reader Mode distillability uses Mojo

components/dom_distiller/content/browser/distillability_driver.cc

Index: components/dom_distiller/content/browser/distillability_driver.cc
diff --git a/components/dom_distiller/content/browser/distillability_driver.cc b/components/dom_distiller/content/browser/distillability_driver.cc
index 8af458f5c0aad8be7e990a992191caf4e6b9b34d..0a2c739d1179454f55c5455de86d6964556501ed 100644
--- a/components/dom_distiller/content/browser/distillability_driver.cc
+++ b/components/dom_distiller/content/browser/distillability_driver.cc
@@ -3,42 +3,63 @@
 // found in the LICENSE file.
 
 #include "components/dom_distiller/content/browser/distillability_driver.h"
-#include "components/dom_distiller/content/common/distiller_messages.h"
 
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
+#include "content/public/common/service_registry.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(
     dom_distiller::DistillabilityDriver);
 
 namespace dom_distiller {
 
+// Implementation of the Mojo DistillabilityService. This is called by the
+// renderer to notify the browser that a page is distillable.
+class DistillabilityServiceImpl : public DistillabilityService {
+ public:
+  DistillabilityServiceImpl(
+      mojo::InterfaceRequest<DistillabilityService> request,
+      DistillabilityDriver* distillability_driver)
+      : binding_(this, std::move(request)),
+        distillability_driver_(distillability_driver) {}
+
+  ~DistillabilityServiceImpl() override {}
+
+  void NotifyIsDistillable(bool is_distillable, bool is_last_update) override {
+    distillability_driver_->OnDistillability(is_distillable, is_last_update);
+  }
+
+ private:
+  mojo::StrongBinding<DistillabilityService> binding_;
+  DistillabilityDriver* distillability_driver_;
+};
+
 DistillabilityDriver::DistillabilityDriver(
     content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
+    : content::WebContentsObserver(web_contents),
+      weak_factory_(this) {
+  if (!web_contents) return;
+  web_contents->GetMainFrame()->GetServiceRegistry()->AddService(
+      base::Bind(&DistillabilityDriver::CreateDistillabilityService,
+          weak_factory_.GetWeakPtr()));
 }
 
 DistillabilityDriver::~DistillabilityDriver() {
   CleanUp();
 }
 
+void DistillabilityDriver::CreateDistillabilityService(
+    mojo::InterfaceRequest<DistillabilityService> request) {
+  new DistillabilityServiceImpl(std::move(request), this);
+}
+
 void DistillabilityDriver::SetDelegate(
     const base::Callback<void(bool, bool)>& delegate) {
   m_delegate_ = delegate;
 }
 
-bool DistillabilityDriver::OnMessageReceived(const IPC::Message &msg,
-    content::RenderFrameHost* render_frame_host) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(DistillabilityDriver, msg)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_Distillability,
-                        OnDistillability)
-  IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
 void DistillabilityDriver::OnDistillability(
     bool distillable, bool is_last) {
   if (m_delegate_.is_null()) return;
@@ -52,6 +73,9 @@ void DistillabilityDriver::RenderProcessGone(
 }
 
 void DistillabilityDriver::CleanUp() {
+  if (!web_contents()) return;
+  web_contents()->GetMainFrame()->GetServiceRegistry()
+      ->RemoveService<DistillabilityService>();
   content::WebContentsObserver::Observe(NULL);
 }