Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18

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 "content/public/browser/content_browser_client.h"
 
 namespace content {
 
@@ skipping 12 matching lines @@
     case PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER:
       return PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
   }
 
   NOTREACHED();
   return PERMISSION_NUM;
 }
 
 } // anonymous namespace
 
-PermissionServiceImpl::PendingRequest::PendingRequest(PermissionType permission,
-                                                      const GURL& origin)
+PermissionServiceImpl::PendingRequest::PendingRequest(
+    PermissionType permission,
+    const GURL& origin,
+    const mojo::Callback<void(PermissionStatus)>& callback)
     : permission(permission),
-      origin(origin) {
+      origin(origin),
+      callback(callback) {
+}
+
+PermissionServiceImpl::PendingRequest::~PendingRequest() {
+  if (!callback.is_null()) {
+    callback.Run(PERMISSION_STATUS_ASK);
+  }
 }
 
 PermissionServiceImpl::PermissionServiceImpl(PermissionServiceContext* context)
     : context_(context),
       weak_factory_(this) {
 }
 
 PermissionServiceImpl::~PermissionServiceImpl() {
 }
 
@@ skipping 16 matching lines @@
   // permission status is returned.
   if (!context_->web_contents()) {
     // There is no way to show a UI so the call will simply return the current
     // permission.
     HasPermission(permission, origin, callback);
     return;
   }
 
   PermissionType permission_type = PermissionNameToPermissionType(permission);
   int request_id = pending_requests_.Add(
-      new PendingRequest(permission_type, GURL(origin)));
+      new PendingRequest(permission_type, GURL(origin), callback));
 
   GetContentClient()->browser()->RequestPermission(
       permission_type,
       context_->web_contents(),
       request_id,
       GURL(origin),
       user_gesture, // TODO(mlamouri): should be removed (crbug.com/423770)
       base::Bind(&PermissionServiceImpl::OnRequestPermissionResponse,
                  weak_factory_.GetWeakPtr(),
-                 callback,
                  request_id));
 }
 
 void PermissionServiceImpl::OnRequestPermissionResponse(
-    const mojo::Callback<void(PermissionStatus)>& callback,
     int request_id,
     PermissionStatus status) {
+  PendingRequest* request = pending_requests_.Lookup(request_id);
+  mojo::Callback<void(PermissionStatus)> callback(request->callback);
+  request->callback.reset();
   pending_requests_.Remove(request_id);
-
   callback.Run(status);
 }
 
 void PermissionServiceImpl::CancelPendingRequests() {
   DCHECK(context_->web_contents());
 
   for (RequestsMap::Iterator<PendingRequest> it(&pending_requests_);
        !it.IsAtEnd(); it.Advance()) {
     GetContentClient()->browser()->CancelPermissionRequest(
         it.GetCurrentValue()->permission,
@@ skipping 47 matching lines @@
 void PermissionServiceImpl::ResetPermissionStatus(PermissionType type,
                                                   GURL origin) {
   // If the embedding_origin is empty we'll use |origin| instead.
   GURL embedding_origin = context_->GetEmbeddingOrigin();
   GetContentClient()->browser()->ResetPermission(
       type, context_->GetBrowserContext(), origin,
       embedding_origin.is_empty() ? origin : embedding_origin);
 }
 
 }  // namespace content