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

content/browser/permissions/permission_service_impl.cc

Index: content/browser/permissions/permission_service_impl.cc
diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc
index 0fb9fb41bdbd576c1c7b525c89837e4edfd37ea2..8901f0c0a5cb5303a5d249b07e36397f342b1438 100644
--- a/content/browser/permissions/permission_service_impl.cc
+++ b/content/browser/permissions/permission_service_impl.cc
@@ -12,29 +12,32 @@
 #include "content/public/browser/permission_manager.h"
 #include "content/public/browser/permission_type.h"
 
+using blink::mojom::PermissionName;
+using blink::mojom::PermissionStatus;
+
 namespace content {
 
 namespace {
 
-PermissionType PermissionNameToPermissionType(mojom::PermissionName name) {
+PermissionType PermissionNameToPermissionType(PermissionName name) {
   switch(name) {
-    case mojom::PermissionName::GEOLOCATION:
+    case PermissionName::GEOLOCATION:

[jam, 2016/03/31 19:45:52]

(not for this cl)

this duplicate enum seems unnecessary; we should remove it. the only difference
is BACKGROUND_SYNC which isn't in the mojom, seems fine to add it there.

       return PermissionType::GEOLOCATION;
-    case mojom::PermissionName::NOTIFICATIONS:
+    case PermissionName::NOTIFICATIONS:
       return PermissionType::NOTIFICATIONS;
-    case mojom::PermissionName::PUSH_NOTIFICATIONS:
+    case PermissionName::PUSH_NOTIFICATIONS:
       return PermissionType::PUSH_MESSAGING;
-    case mojom::PermissionName::MIDI:
+    case PermissionName::MIDI:
       return PermissionType::MIDI;
-    case mojom::PermissionName::MIDI_SYSEX:
+    case PermissionName::MIDI_SYSEX:
       return PermissionType::MIDI_SYSEX;
-    case mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER:
+    case PermissionName::PROTECTED_MEDIA_IDENTIFIER:
       return PermissionType::PROTECTED_MEDIA_IDENTIFIER;
-    case mojom::PermissionName::DURABLE_STORAGE:
+    case PermissionName::DURABLE_STORAGE:
       return PermissionType::DURABLE_STORAGE;
-    case mojom::PermissionName::AUDIO_CAPTURE:
+    case PermissionName::AUDIO_CAPTURE:
       return PermissionType::AUDIO_CAPTURE;
-    case mojom::PermissionName::VIDEO_CAPTURE:
+    case PermissionName::VIDEO_CAPTURE:
       return PermissionType::VIDEO_CAPTURE;
   }
 
@@ -45,8 +48,8 @@ PermissionType PermissionNameToPermissionType(mojom::PermissionName name) {
 // This function allows the usage of the the multiple request map
 // with single requests.
 void PermissionRequestResponseCallbackWrapper(
-    const mojo::Callback<void(mojom::PermissionStatus)>& callback,
-    const mojo::Array<mojom::PermissionStatus>& vector) {
+    const mojo::Callback<void(PermissionStatus)>& callback,
+    const mojo::Array<PermissionStatus>& vector) {
   DCHECK_EQ(vector.size(), 1ul);
   callback.Run(vector[0]);
 }
@@ -64,10 +67,10 @@ PermissionServiceImpl::PendingRequest::~PendingRequest() {
   if (callback.is_null())
     return;
 
-  mojo::Array<mojom::PermissionStatus> result =
-      mojo::Array<mojom::PermissionStatus>::New(request_count);
+  mojo::Array<PermissionStatus> result =
+      mojo::Array<PermissionStatus>::New(request_count);
   for (int i = 0; i < request_count; ++i)
-    result[i] = mojom::PermissionStatus::DENIED;
+    result[i] = PermissionStatus::DENIED;
   callback.Run(std::move(result));
 }
 
@@ -83,12 +86,12 @@ PermissionServiceImpl::PendingSubscription::PendingSubscription(
 
 PermissionServiceImpl::PendingSubscription::~PendingSubscription() {
   if (!callback.is_null())
-    callback.Run(mojom::PermissionStatus::ASK);
+    callback.Run(PermissionStatus::ASK);
 }
 
 PermissionServiceImpl::PermissionServiceImpl(
     PermissionServiceContext* context,
-    mojo::InterfaceRequest<mojom::PermissionService> request)
+    mojo::InterfaceRequest<blink::mojom::PermissionService> request)
     : context_(context),
       binding_(this, std::move(request)),
       weak_factory_(this) {
@@ -107,7 +110,7 @@ void PermissionServiceImpl::OnConnectionError() {
 }
 
 void PermissionServiceImpl::RequestPermission(
-    mojom::PermissionName permission,
+    PermissionName permission,
     const mojo::String& origin,
     const PermissionStatusCallback& callback) {
   // This condition is valid if the call is coming from a ChildThread instead of
@@ -146,17 +149,17 @@ void PermissionServiceImpl::RequestPermission(
 
 void PermissionServiceImpl::OnRequestPermissionResponse(
     int pending_request_id,
-    mojom::PermissionStatus status) {
+    PermissionStatus status) {
   OnRequestPermissionsResponse(pending_request_id,
-                               std::vector<mojom::PermissionStatus>(1, status));
+                               std::vector<PermissionStatus>(1, status));
 }
 
 void PermissionServiceImpl::RequestPermissions(
-    mojo::Array<mojom::PermissionName> permissions,
+    mojo::Array<PermissionName> permissions,
     const mojo::String& origin,
     const PermissionsStatusCallback& callback) {
   if (permissions.is_null()) {
-    callback.Run(mojo::Array<mojom::PermissionStatus>());
+    callback.Run(mojo::Array<PermissionStatus>());
     return;
   }
 
@@ -171,7 +174,7 @@ void PermissionServiceImpl::RequestPermissions(
   DCHECK(browser_context);
   if (!context_->render_frame_host() ||
       !browser_context->GetPermissionManager()) {
-    mojo::Array<mojom::PermissionStatus> result(permissions.size());
+    mojo::Array<PermissionStatus> result(permissions.size());
     for (size_t i = 0; i < permissions.size(); ++i) {
       result[i] =
           GetPermissionStatusFromName(permissions[i], GURL(origin.get()));
@@ -205,12 +208,12 @@ void PermissionServiceImpl::RequestPermissions(
 
 void PermissionServiceImpl::OnRequestPermissionsResponse(
     int pending_request_id,
-    const std::vector<mojom::PermissionStatus>& result) {
+    const std::vector<PermissionStatus>& result) {
   PendingRequest* request = pending_requests_.Lookup(pending_request_id);
   PermissionsStatusCallback callback(request->callback);
   request->callback.reset();
   pending_requests_.Remove(pending_request_id);
-  callback.Run(mojo::Array<mojom::PermissionStatus>::From(result));
+  callback.Run(mojo::Array<PermissionStatus>::From(result));
 }
 
 void PermissionServiceImpl::CancelPendingOperations() {
@@ -242,24 +245,24 @@ void PermissionServiceImpl::CancelPendingOperations() {
 }
 
 void PermissionServiceImpl::HasPermission(
-    mojom::PermissionName permission,
+    PermissionName permission,
     const mojo::String& origin,
     const PermissionStatusCallback& callback) {
   callback.Run(GetPermissionStatusFromName(permission, GURL(origin.get())));
 }
 
 void PermissionServiceImpl::RevokePermission(
-    mojom::PermissionName permission,
+    PermissionName permission,
     const mojo::String& origin,
     const PermissionStatusCallback& callback) {
   GURL origin_url(origin.get());
   PermissionType permission_type = PermissionNameToPermissionType(permission);
-  mojom::PermissionStatus status =
+  PermissionStatus status =
       GetPermissionStatusFromType(permission_type, origin_url);
 
   // Resetting the permission should only be possible if the permission is
   // already granted.
-  if (status != mojom::PermissionStatus::GRANTED) {
+  if (status != PermissionStatus::GRANTED) {
     callback.Run(status);
     return;
   }
@@ -270,12 +273,12 @@ void PermissionServiceImpl::RevokePermission(
 }
 
 void PermissionServiceImpl::GetNextPermissionChange(
-    mojom::PermissionName permission,
+    PermissionName permission,
     const mojo::String& mojo_origin,
-    mojom::PermissionStatus last_known_status,
+    PermissionStatus last_known_status,
     const PermissionStatusCallback& callback) {
   GURL origin(mojo_origin.get());
-  mojom::PermissionStatus current_status =
+  PermissionStatus current_status =
       GetPermissionStatusFromName(permission, origin);
   if (current_status != last_known_status) {
     callback.Run(current_status);
@@ -310,20 +313,20 @@ void PermissionServiceImpl::GetNextPermissionChange(
                      pending_subscription_id));
 }
 
-mojom::PermissionStatus PermissionServiceImpl::GetPermissionStatusFromName(
-    mojom::PermissionName permission,
+PermissionStatus PermissionServiceImpl::GetPermissionStatusFromName(
+    PermissionName permission,
     const GURL& origin) {
   return GetPermissionStatusFromType(PermissionNameToPermissionType(permission),
                                      origin);
 }
 
-mojom::PermissionStatus PermissionServiceImpl::GetPermissionStatusFromType(
+PermissionStatus PermissionServiceImpl::GetPermissionStatusFromType(
     PermissionType type,
     const GURL& origin) {
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!browser_context->GetPermissionManager())
-    return mojom::PermissionStatus::DENIED;
+    return PermissionStatus::DENIED;
 
   // If the embedding_origin is empty we'll use |origin| instead.
   GURL embedding_origin = context_->GetEmbeddingOrigin();
@@ -346,7 +349,7 @@ void PermissionServiceImpl::ResetPermissionStatus(PermissionType type,
 
 void PermissionServiceImpl::OnPermissionStatusChanged(
     int pending_subscription_id,
-    mojom::PermissionStatus status) {
+    PermissionStatus status) {
   PendingSubscription* subscription =
       pending_subscriptions_.Lookup(pending_subscription_id);