Change RenderFrame to use InterfaceRegistry et al.

components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

 // Copyright 2014 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 "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 18 matching lines @@
 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/dom_distiller/core/viewer.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/service_registry.h"
 #include "grit/components_strings.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/base/url_util.h"
 #include "net/url_request/url_request.h"
+#include "services/shell/public/cpp/interface_provider.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace dom_distiller {
 
 // Handles receiving data asynchronously for a specific entry, and passing
 // it along to the data callback for the data source. Lifetime matches that of
 // the current main frame's page in the Viewer instance.
 class DomDistillerViewerSource::RequestViewerHandle
     : public DomDistillerRequestViewBase,
       public content::WebContentsObserver {
@@ skipping 183 matching lines @@
       web_contents->GetContainerBounds().size());
 
   GURL current_url(url_utils::GetValueForKeyInUrlPathQuery(path, kUrlKey));
   std::string unsafe_page_html = viewer::GetUnsafeArticleTemplateHtml(
       url_utils::GetOriginalUrlFromDistillerUrl(current_url).spec(),
       dom_distiller_service_->GetDistilledPagePrefs()->GetTheme(),
       dom_distiller_service_->GetDistilledPagePrefs()->GetFontFamily());
 
   // Add mojo service for JavaScript functionality. This is the receiving end
   // of this particular service.
-  render_frame_host->GetServiceRegistry()->AddService(
+  render_frame_host->GetInterfaceRegistry()->AddInterface(
       base::Bind(&CreateDistillerJavaScriptService,
           render_frame_host,
           distiller_ui_handle_.get()));
 
   // Tell the renderer that this is currently a distilled page.
   mojom::DistillerPageNotifierServicePtr page_notifier_service;
-  render_frame_host->GetServiceRegistry()->ConnectToRemoteService(
-      mojo::GetProxy(&page_notifier_service));
+  render_frame_host->GetRemoteInterfaces()->GetInterface(
+      &page_notifier_service);
   DCHECK(page_notifier_service);
   page_notifier_service->NotifyIsDistillerPage();
 
   if (viewer_handle) {
     // The service returned a |ViewerHandle| and guarantees it will call
     // the |RequestViewerHandle|, so passing ownership to it, to ensure the
     // request is not cancelled. The |RequestViewerHandle| will delete itself
     // after receiving the callback.
     request_viewer_handle->TakeViewerHandle(std::move(viewer_handle));
   } else {
@@ skipping 28 matching lines @@
 std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
     const {
   return "style-src 'self' https://fonts.googleapis.com;";
 }
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
   return "child-src *;";
 }
 
 }  // namespace dom_distiller