Change RenderFrame to use InterfaceRegistry et al.

content/child/permissions/permission_dispatcher.cc

 // Copyright 2015 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 "content/child/permissions/permission_dispatcher.h"
 
 #include <stddef.h>
 #include <utility>
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "content/public/child/worker_thread.h"
-#include "content/public/common/service_registry.h"
+#include "services/shell/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/modules/permissions/WebPermissionObserver.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 
 using blink::WebPermissionObserver;
 using blink::mojom::PermissionName;
 using blink::mojom::PermissionStatus;
 
 namespace content {
 
@@ skipping 58 matching lines @@
 // static
 bool PermissionDispatcher::IsObservable(blink::WebPermissionType type) {
   return type == blink::WebPermissionTypeGeolocation ||
          type == blink::WebPermissionTypeNotifications ||
          type == blink::WebPermissionTypePushNotifications ||
          type == blink::WebPermissionTypeMidiSysEx ||
          type == blink::WebPermissionTypeMidi ||
          type == blink::WebPermissionTypeBackgroundSync;
 }
 
-PermissionDispatcher::PermissionDispatcher(ServiceRegistry* service_registry)
-    : service_registry_(service_registry) {
+PermissionDispatcher::PermissionDispatcher(
+    shell::InterfaceProvider* remote_interfaces)
+    : remote_interfaces_(remote_interfaces) {
 }
 
 PermissionDispatcher::~PermissionDispatcher() {
 }
 
 void PermissionDispatcher::queryPermission(
     blink::WebPermissionType type,
     const blink::WebURL& origin,
     blink::WebPermissionCallback* callback) {
   QueryPermissionInternal(
@@ skipping 120 matching lines @@
 
 void PermissionDispatcher::RunPermissionsCallbackOnWorkerThread(
     std::unique_ptr<blink::WebPermissionsCallback> callback,
     std::unique_ptr<blink::WebVector<blink::WebPermissionStatus>> statuses) {
   callback->onSuccess(std::move(statuses));
 }
 
 blink::mojom::PermissionService*
 PermissionDispatcher::GetPermissionServicePtr() {
   if (!permission_service_.get()) {
-    service_registry_->ConnectToRemoteService(
-        mojo::GetProxy(&permission_service_));
+    remote_interfaces_->GetInterface(mojo::GetProxy(&permission_service_));
   }
   return permission_service_.get();
 }
 
 void PermissionDispatcher::QueryPermissionInternal(
     blink::WebPermissionType type,
     const std::string& origin,
     blink::WebPermissionCallback* callback,
     int worker_thread_id) {
   // We need to save the |callback| in an ScopedPtrHashMap so if |this| gets
@@ skipping 159 matching lines @@
       origin,
       current_status,
       base::Bind(&PermissionDispatcher::OnPermissionChanged,
                  base::Unretained(this),
                  type,
                  origin,
                  base::Unretained(observer)));
 }
 
 }  // namespace content