Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/

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/WebGeolocationClient.h"
-#include "third_party/WebKit/public/web/WebGeolocationError.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"
 
 using blink::WebGeolocationController;
 using blink::WebGeolocationError;
 using blink::WebGeolocationPermissionRequest;
 using blink::WebGeolocationPermissionRequestManager;
 using blink::WebGeolocationPosition;
 
 namespace content {
 
 GeolocationDispatcher::GeolocationDispatcher(RenderFrame* render_frame)
@@ skipping 48 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(
-      permissions::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,
-    permissions::mojom::PermissionStatus status) {
+    blink::mojom::PermissionStatus status) {
   WebGeolocationPermissionRequest permissionRequest;
   if (!pending_permissions_->remove(permission_request_id, permissionRequest))
     return;
 
   permissionRequest.setIsAllowed(status ==
-                                 permissions::mojom::PermissionStatus::GRANTED);
+                                 blink::mojom::PermissionStatus::GRANTED);
 }
 
 void GeolocationDispatcher::QueryNextPosition() {
   DCHECK(geolocation_service_);
   geolocation_service_->QueryNextPosition(
       base::Bind(&GeolocationDispatcher::OnPositionUpdate,
                  base::Unretained(this)));
 }
 
 void GeolocationDispatcher::OnPositionUpdate(
@@ skipping 27 matching lines @@
       default:
         NOTREACHED() << geoposition->error_code;
         return;
     }
     controller_->errorOccurred(WebGeolocationError(
         code, blink::WebString::fromUTF8(geoposition->error_message)));
   }
 }
 
 }  // namespace content