Move geolocation and permission mojoms into WebKit/public/platform.

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/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"
@@ skipping 62 matching lines @@
 void GeolocationDispatcher::requestPermission(
     const WebGeolocationPermissionRequest& permissionRequest) {
   if (!permission_service_.get()) {
     render_frame()->GetServiceRegistry()->ConnectToRemoteService(
         mojo::GetProxy(&permission_service_));
   }
 
   int permission_request_id = pending_permissions_->add(permissionRequest);
 
   permission_service_->RequestPermission(
-      mojom::PermissionName::GEOLOCATION,
+      blink::mojom::PermissionName::GEOLOCATION,
       permissionRequest.getSecurityOrigin().toString().utf8(),
       base::Bind(&GeolocationDispatcher::OnPermissionSet,
                  base::Unretained(this), permission_request_id));
 }
 
 void GeolocationDispatcher::cancelPermissionRequest(
     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 permission_request_id,
-                                            mojom::PermissionStatus status) {
+void GeolocationDispatcher::OnPermissionSet(
+    int permission_request_id,
+    blink::mojom::PermissionStatus status) {
   WebGeolocationPermissionRequest permissionRequest;
   if (!pending_permissions_->remove(permission_request_id, permissionRequest))
     return;
 
-  permissionRequest.setIsAllowed(status == mojom::PermissionStatus::GRANTED);
+  permissionRequest.setIsAllowed(status ==
+                                 blink::mojom::PermissionStatus::GRANTED);
 }
 
 void GeolocationDispatcher::QueryNextPosition() {
   DCHECK(geolocation_service_);
   geolocation_service_->QueryNextPosition(
       base::Bind(&GeolocationDispatcher::OnPositionUpdate,
                  base::Unretained(this)));
 }
 
 void GeolocationDispatcher::OnPositionUpdate(
-    mojom::MojoGeopositionPtr geoposition) {
+    blink::mojom::GeopositionPtr geoposition) {
   QueryNextPosition();
 
   if (geoposition->valid) {
     controller_->positionChanged(WebGeolocationPosition(
         geoposition->timestamp,
         geoposition->latitude,
         geoposition->longitude,
         geoposition->accuracy,
         // Lowest point on land is at approximately -400 meters.
             geoposition->altitude > -10000.,
         geoposition->altitude,
         geoposition->altitude_accuracy >= 0.,
         geoposition->altitude_accuracy,
         geoposition->heading >= 0. && geoposition->heading <= 360.,
         geoposition->heading,
         geoposition->speed >= 0.,
         geoposition->speed));
   } else {
     WebGeolocationError::Error code;
     switch (geoposition->error_code) {
-      case mojom::MojoGeoposition::ErrorCode::PERMISSION_DENIED:
+      case blink::mojom::Geoposition::ErrorCode::PERMISSION_DENIED:
         code = WebGeolocationError::ErrorPermissionDenied;
         break;
-      case mojom::MojoGeoposition::ErrorCode::POSITION_UNAVAILABLE:
+      case blink::mojom::Geoposition::ErrorCode::POSITION_UNAVAILABLE:
         code = WebGeolocationError::ErrorPositionUnavailable;
         break;
       default:
         NOTREACHED() << geoposition->error_code;
         return;
     }
     controller_->errorOccurred(WebGeolocationError(
         code, blink::WebString::fromUTF8(geoposition->error_message)));
   }
 }
 
 }  // namespace content