Implement basic mojo Permission service and use it for Geolocation.

content/renderer/geolocation_dispatcher.cc

 // Copyright (c) 2012 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/renderer/geolocation_dispatcher.h"
 
-#include "content/common/geolocation_messages.h"
+#include "content/child/child_thread.h"
+#include "content/public/common/geoposition.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebGeolocationPermissionRequest.h"
 #include "third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h"
 #include "third_party/WebKit/public/web/WebGeolocationClient.h"
 #include "third_party/WebKit/public/web/WebGeolocationPosition.h"
 #include "third_party/WebKit/public/web/WebGeolocationError.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 
 using blink::WebGeolocationController;
 using blink::WebGeolocationError;
 using blink::WebGeolocationPermissionRequest;
 using blink::WebGeolocationPermissionRequestManager;
 using blink::WebGeolocationPosition;
 
 namespace content {
 
 GeolocationDispatcher::GeolocationDispatcher(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame),
       pending_permissions_(new WebGeolocationPermissionRequestManager()),
-      enable_high_accuracy_(false) {
+      enable_high_accuracy_(false),
+      weak_ptr_factory_(this) {
 }
 
 GeolocationDispatcher::~GeolocationDispatcher() {}
 
-bool GeolocationDispatcher::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(GeolocationDispatcher, message)
-    IPC_MESSAGE_HANDLER(GeolocationMsg_PermissionSet, OnPermissionSet)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
 void GeolocationDispatcher::startUpdating() {
   if (!geolocation_service_.get()) {
     render_frame()->GetServiceRegistry()->ConnectToRemoteService(
         &geolocation_service_);
     geolocation_service_.set_client(this);
   }
   if (enable_high_accuracy_)
     geolocation_service_->SetHighAccuracy(true);
 }
 
@@ skipping 23 matching lines @@
   // would have to fetch it synchronously to give a good value here.  The
   // WebCore::GeolocationController already caches the last position it
   // receives, so there is not much benefit to more position caching here.
   return false;
 }
 
 // TODO(jknotten): Change the messages to use a security origin, so no
 // conversion is necessary.
 void GeolocationDispatcher::requestPermission(
     const WebGeolocationPermissionRequest& permissionRequest) {
-  int bridge_id = pending_permissions_->add(permissionRequest);
-  base::string16 origin = permissionRequest.securityOrigin().toString();
-  Send(new GeolocationHostMsg_RequestPermission(
-      routing_id(), bridge_id, GURL(origin),
-      blink::WebUserGestureIndicator::isProcessingUserGesture()));
+  if (!permission_service_.get()) {
+    render_frame()->GetServiceRegistry()->ConnectToRemoteService(
+        &permission_service_);
+  }
+
+  int permission_request_id = pending_permissions_->add(permissionRequest);
+
+  PermissionName permission = PERMISSION_NAME_GEOLOCATION;
+
+  permission_service_->RequestPermission(
+      permission,
+      permissionRequest.securityOrigin().toString().utf8(),
+      base::Bind(&GeolocationDispatcher::OnPermissionSet,
+                 weak_ptr_factory_.GetWeakPtr(),

[blundell, 2014/11/14 12:11:52]

This doesn't need to be a weak ptr, as |permission_service_| is owned by this
instance.

+                 permission_request_id));
 }
 
 void GeolocationDispatcher::cancelPermissionRequest(
-    const WebGeolocationPermissionRequest& permissionRequest) {
-  int bridge_id;
-  pending_permissions_->remove(permissionRequest, bridge_id);
+    const blink::WebGeolocationPermissionRequest& permissionRequest) {
+  int permission_request_id;
+  pending_permissions_->remove(permissionRequest, permission_request_id);
 }
 
 // Permission for using geolocation has been set.
-void GeolocationDispatcher::OnPermissionSet(int bridge_id, bool is_allowed) {
+void GeolocationDispatcher::OnPermissionSet(
+    int permission_request_id,
+    PermissionStatus status) {
   WebGeolocationPermissionRequest permissionRequest;
-  if (!pending_permissions_->remove(bridge_id, permissionRequest))
+  if (!pending_permissions_->remove(permission_request_id, permissionRequest))
     return;
-  permissionRequest.setIsAllowed(is_allowed);
+
+  permissionRequest.setIsAllowed(status == PERMISSION_STATUS_GRANTED);
 }
 
 void GeolocationDispatcher::OnLocationUpdate(MojoGeopositionPtr geoposition) {
   DCHECK(geolocation_service_.get());
 
   if (geoposition->valid) {
     controller_->positionChanged(WebGeolocationPosition(
         geoposition->timestamp,
         geoposition->latitude,
         geoposition->longitude,
@@ skipping 19 matching lines @@
       default:
         NOTREACHED() << geoposition->error_code;
         return;
     }
     controller_->errorOccurred(WebGeolocationError(
         code, blink::WebString::fromUTF8(geoposition->error_message)));
   }
 }
 
 }  // namespace content