Revert of Deletes mojo::Callback

content/browser/permissions/permission_service_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
 
-#include "base/callback.h"
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/permissions/permission_service_context.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojom.h"
 
 namespace content {
 
 enum class PermissionType;
@@ skipping 16 matching lines @@
 
  protected:
   friend PermissionServiceContext;
 
   PermissionServiceImpl(
       PermissionServiceContext* context,
       mojo::InterfaceRequest<blink::mojom::PermissionService> request);
 
  private:
   using PermissionStatusCallback =
-      base::Callback<void(blink::mojom::PermissionStatus)>;
+      mojo::Callback<void(blink::mojom::PermissionStatus)>;
+  using PermissionsStatusCallback =
+      mojo::Callback<void(mojo::Array<blink::mojom::PermissionStatus>)>;
 
   struct PendingRequest {
-    PendingRequest(const RequestPermissionsCallback& callback,
+    PendingRequest(const PermissionsStatusCallback& callback,
                    int request_count);
     ~PendingRequest();
 
     // Request ID received from the PermissionManager.
     int id;
-    RequestPermissionsCallback callback;
+    PermissionsStatusCallback callback;
     int request_count;
   };
   using RequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
 
   struct PendingSubscription {
     PendingSubscription(PermissionType permission, const GURL& origin,
                         const PermissionStatusCallback& callback);
     ~PendingSubscription();
 
     // Subscription ID received from the PermissionManager.
     int id;
     PermissionType permission;
     GURL origin;
     PermissionStatusCallback callback;
   };
   using SubscriptionsMap = IDMap<PendingSubscription, IDMapOwnPointer>;
 
   // blink::mojom::PermissionService.
   void HasPermission(blink::mojom::PermissionName permission,
                      const mojo::String& origin,
                      const PermissionStatusCallback& callback) override;
   void RequestPermission(blink::mojom::PermissionName permission,
                          const mojo::String& origin,
                          bool user_gesture,
                          const PermissionStatusCallback& callback) override;
   void RequestPermissions(mojo::Array<blink::mojom::PermissionName> permissions,
                           const mojo::String& origin,
                           bool user_gesture,
-                          const RequestPermissionsCallback& callback) override;
+                          const PermissionsStatusCallback& callback) override;
   void RevokePermission(blink::mojom::PermissionName permission,
                         const mojo::String& origin,
                         const PermissionStatusCallback& callback) override;
   void GetNextPermissionChange(
       blink::mojom::PermissionName permission,
       const mojo::String& origin,
       blink::mojom::PermissionStatus last_known_status,
       const PermissionStatusCallback& callback) override;
 
   void OnConnectionError();
@@ skipping 21 matching lines @@
   PermissionServiceContext* context_;
   mojo::Binding<blink::mojom::PermissionService> binding_;
   base::WeakPtrFactory<PermissionServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_