Add PermissionDescriptor to the permissions Mojo interface.

third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 15 matching lines @@
  */
 
 #include "modules/geolocation/Geolocation.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/HostsUsingFeatures.h"
 #include "core/frame/Settings.h"
 #include "modules/geolocation/Coordinates.h"
 #include "modules/geolocation/GeolocationError.h"
+#include "modules/permissions/PermissionUtils.h"
 #include "platform/UserGestureIndicator.h"
-#include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 namespace {
 
 static const char permissionDeniedErrorMessage[] = "User denied Geolocation";
 static const char failedToStartServiceErrorMessage[] =
@@ skipping 377 matching lines @@
 
   m_geolocationPermission = PermissionRequested;
   frame->interfaceProvider()->getInterface(
       mojo::GetProxy(&m_permissionService));
   m_permissionService.set_connection_error_handler(
       convertToBaseCallback(WTF::bind(&Geolocation::onPermissionConnectionError,
                                       wrapWeakPersistent(this))));
 
   // Ask the embedder: it maintains the geolocation challenge policy itself.
   m_permissionService->RequestPermission(
-      mojom::blink::PermissionName::GEOLOCATION,
+      createPermissionDescriptor(mojom::blink::PermissionName::GEOLOCATION),
       getExecutionContext()->getSecurityOrigin(),
       UserGestureIndicator::processingUserGesture(),
       convertToBaseCallback(WTF::bind(
           &Geolocation::onGeolocationPermissionUpdated, wrapPersistent(this))));
 }
 
 void Geolocation::makeSuccessCallbacks() {
   DCHECK(m_lastPosition);
   DCHECK(isAllowed());
 
@@ skipping 102 matching lines @@
   // be called. In that case, blink has already shut down so do nothing.
   //
   // TODO(sammc): Remove this once renderer shutdown is no longer graceful.
   if (!Platform::current())
     return;
 
   onGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED);
 }
 
 }  // namespace blink