mojo::Callback -> base::Callback

content/browser/permissions/permission_service_impl.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 "content/browser/permissions/permission_service_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 33 matching lines @@
   }
 
   NOTREACHED();
   return PermissionType::NUM;
 }
 
 // This function allows the usage of the the multiple request map
 // with single requests.
 void PermissionRequestResponseCallbackWrapper(
     const mojo::Callback<void(PermissionStatus)>& callback,
-    const mojo::Array<PermissionStatus>& vector) {
+    mojo::Array<PermissionStatus> vector) {
   DCHECK_EQ(vector.size(), 1ul);
   callback.Run(vector[0]);
 }
 
 } // anonymous namespace
 
 PermissionServiceImpl::PendingRequest::PendingRequest(
     const PermissionsStatusCallback& callback,
     int request_count)
     : callback(callback),
@@ skipping 144 matching lines @@
   if (!pending_request)
       return;
   pending_request->id = id;
 }
 
 void PermissionServiceImpl::OnRequestPermissionsResponse(
     int pending_request_id,
     const std::vector<PermissionStatus>& result) {
   PendingRequest* request = pending_requests_.Lookup(pending_request_id);
   PermissionsStatusCallback callback(request->callback);
-  request->callback.reset();
+  request->callback.Reset();
   pending_requests_.Remove(pending_request_id);
   callback.Run(mojo::Array<PermissionStatus>::From(result));
 }
 
 void PermissionServiceImpl::CancelPendingOperations() {
   DCHECK(context_->GetBrowserContext());
 
   PermissionManager* permission_manager =
       context_->GetBrowserContext()->GetPermissionManager();
   if (!permission_manager)
     return;
 
   // Cancel pending requests.
   for (RequestsMap::Iterator<PendingRequest> it(&pending_requests_);
        !it.IsAtEnd(); it.Advance()) {
     permission_manager->CancelPermissionRequest(
         it.GetCurrentValue()->id);
   }
   pending_requests_.Clear();
 
   // Cancel pending subscriptions.
   for (SubscriptionsMap::Iterator<PendingSubscription>
           it(&pending_subscriptions_); !it.IsAtEnd(); it.Advance()) {
     it.GetCurrentValue()->callback.Run(GetPermissionStatusFromType(
         it.GetCurrentValue()->permission, it.GetCurrentValue()->origin));
-    it.GetCurrentValue()->callback.reset();
+    it.GetCurrentValue()->callback.Reset();
     permission_manager->UnsubscribePermissionStatusChange(
         it.GetCurrentValue()->id);
   }
   pending_subscriptions_.Clear();
 }
 
 void PermissionServiceImpl::HasPermission(
     PermissionName permission,
     const mojo::String& origin,
     const PermissionStatusCallback& callback) {
@@ skipping 104 matching lines @@
 
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (browser_context->GetPermissionManager()) {
     browser_context->GetPermissionManager()->UnsubscribePermissionStatusChange(
         subscription->id);
   }
 
   PermissionStatusCallback callback = subscription->callback;
 
-  subscription->callback.reset();
+  subscription->callback.Reset();
   pending_subscriptions_.Remove(pending_subscription_id);
 
   callback.Run(status);
 }
 
 }  // namespace content