Change RenderFrame to use InterfaceRegistry et al.

content/child/permissions/permission_dispatcher.h

 // 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.
 
 #ifndef CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_
 #define CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "content/child/permissions/permission_observers_registry.h"
 #include "third_party/WebKit/public/platform/modules/permissions/WebPermissionClient.h"
 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojom.h"
 
+namespace shell {
+class InterfaceProvider;
+}
+
 namespace content {
 
-class ServiceRegistry;
-
 // The PermissionDispatcher is a layer between Blink and the Mojo
 // PermissionService. It implements blink::WebPermissionClient. It is being used
 // from workers and frames independently. When called outside of the main
 // thread, QueryPermissionForWorker is meant to be called. It will handle the
 // thread jumping.
 class PermissionDispatcher : public blink::WebPermissionClient,
                              public PermissionObserversRegistry {
  public:
   // Returns whether the given WebPermissionType is observable. Some types have
   // static values that never changes.
   static bool IsObservable(blink::WebPermissionType type);
 
-  // The caller must guarantee that |service_registry| will have a lifetime
+  // The caller must guarantee that |interface_registry| will have a lifetime
   // larger than this instance of PermissionDispatcher.
-  explicit PermissionDispatcher(ServiceRegistry* service_registry);
+  explicit PermissionDispatcher(shell::InterfaceProvider* remote_interfaces);
   ~PermissionDispatcher() override;
 
   // blink::WebPermissionClient implementation.
   void queryPermission(blink::WebPermissionType type,
                        const blink::WebURL& origin,
                        blink::WebPermissionCallback* callback) override;
   void requestPermission(blink::WebPermissionType,
                          const blink::WebURL& origin,
                          blink::WebPermissionCallback* callback) override;
   void requestPermissions(
@@ skipping 97 matching lines @@
                                const std::string& origin,
                                blink::WebPermissionObserver* observer,
                                blink::mojom::PermissionStatus current_status);
 
   // Pending callbacks for query(), revoke() and request() single permission.
   PermissionCallbackMap permission_callbacks_;
 
   // Pending callbacks for request() multiple permissions.
   PermissionsCallbackMap permissions_callbacks_;
 
-  ServiceRegistry* service_registry_;
+  shell::InterfaceProvider* remote_interfaces_;
   blink::mojom::PermissionServicePtr permission_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionDispatcher);
 };
 
 }  // namespace content
 
 #endif // CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_