Move geolocation and permission mojoms into components.

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 4d16c06c43b172a8543422b6e13e349370b7ab37..ae2938da47d9218fd18985c1ec379b0cd499a28b 100644
--- a/content/browser/permissions/permission_service_impl.cc
+++ b/content/browser/permissions/permission_service_impl.cc
@@ -13,25 +13,25 @@ namespace content {
 
 namespace {
 
-PermissionType PermissionNameToPermissionType(PermissionName name) {
+PermissionType PermissionNameToPermissionType(permission::Name name) {
   switch(name) {
-    case PERMISSION_NAME_GEOLOCATION:
+    case permission::NAME_GEOLOCATION:
       return PermissionType::GEOLOCATION;
-    case PERMISSION_NAME_NOTIFICATIONS:
+    case permission::NAME_NOTIFICATIONS:
       return PermissionType::NOTIFICATIONS;
-    case PERMISSION_NAME_PUSH_NOTIFICATIONS:
+    case permission::NAME_PUSH_NOTIFICATIONS:
       return PermissionType::PUSH_MESSAGING;
-    case PERMISSION_NAME_MIDI:
+    case permission::NAME_MIDI:
       return PermissionType::MIDI;
-    case PERMISSION_NAME_MIDI_SYSEX:
+    case permission::NAME_MIDI_SYSEX:
       return PermissionType::MIDI_SYSEX;
-    case PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER:
+    case permission::NAME_PROTECTED_MEDIA_IDENTIFIER:
       return PermissionType::PROTECTED_MEDIA_IDENTIFIER;
-    case PERMISSION_NAME_DURABLE_STORAGE:
+    case permission::NAME_DURABLE_STORAGE:
       return PermissionType::DURABLE_STORAGE;
-    case PERMISSION_NAME_AUDIO_CAPTURE:
+    case permission::NAME_AUDIO_CAPTURE:
       return PermissionType::AUDIO_CAPTURE;
-    case PERMISSION_NAME_VIDEO_CAPTURE:
+    case permission::NAME_VIDEO_CAPTURE:
       return PermissionType::VIDEO_CAPTURE;
   }
 
@@ -53,7 +53,7 @@ PermissionServiceImpl::PendingRequest::PendingRequest(
 
 PermissionServiceImpl::PendingRequest::~PendingRequest() {
   if (!callback.is_null())
-    callback.Run(PERMISSION_STATUS_ASK);
+    callback.Run(permission::STATUS_ASK);
 }
 
 PermissionServiceImpl::PendingSubscription::PendingSubscription(
@@ -68,15 +68,13 @@ PermissionServiceImpl::PendingSubscription::PendingSubscription(
 
 PermissionServiceImpl::PendingSubscription::~PendingSubscription() {
   if (!callback.is_null())
-    callback.Run(PERMISSION_STATUS_ASK);
+    callback.Run(permission::STATUS_ASK);
 }
 
 PermissionServiceImpl::PermissionServiceImpl(
     PermissionServiceContext* context,
-    mojo::InterfaceRequest<PermissionService> request)
-    : context_(context),
-      binding_(this, request.Pass()),
-      weak_factory_(this) {
+    mojo::InterfaceRequest<permission::PermissionService> request)
+    : context_(context), binding_(this, request.Pass()), weak_factory_(this) {
   binding_.set_connection_error_handler(
       base::Bind(&PermissionServiceImpl::OnConnectionError,
                  base::Unretained(this)));
@@ -92,7 +90,7 @@ void PermissionServiceImpl::OnConnectionError() {
 }
 
 void PermissionServiceImpl::RequestPermission(
-    PermissionName permission,
+    permission::Name permission,
     const mojo::String& origin,
     bool user_gesture,
     const PermissionStatusCallback& callback) {
@@ -113,7 +111,7 @@ void PermissionServiceImpl::RequestPermission(
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!browser_context->GetPermissionManager()) {
-    callback.Run(content::PERMISSION_STATUS_DENIED);
+    callback.Run(permission::STATUS_DENIED);
     return;
   }
 
@@ -140,14 +138,14 @@ void PermissionServiceImpl::RequestPermission(
 }
 
 void PermissionServiceImpl::RequestPermissions(
-    mojo::Array<PermissionName> permissions,
+    mojo::Array<permission::Name> permissions,
     const mojo::String& origin,
     bool user_gesture,
     const PermissionsStatusCallback& callback) {
   // TODO(lalitm,mlamouri): this is returning the current permission statuses
   // in order for the call to successfully return. It will be changed later.
   // See https://crbug.com/516626
-  mojo::Array<PermissionStatus> result(permissions.size());
+  mojo::Array<permission::Status> result(permissions.size());
   for (size_t i = 0; i < permissions.size(); ++i)
     result[i] = GetPermissionStatusFromName(permissions[i], GURL(origin));
   callback.Run(result.Pass());
@@ -155,7 +153,7 @@ void PermissionServiceImpl::RequestPermissions(
 
 void PermissionServiceImpl::OnRequestPermissionResponse(
     int request_id,
-    PermissionStatus status) {
+    permission::Status status) {
   PendingRequest* request = pending_requests_.Lookup(request_id);
   PermissionStatusCallback callback(request->callback);
   request->callback.reset();
@@ -192,24 +190,24 @@ void PermissionServiceImpl::CancelPendingOperations() {
 }
 
 void PermissionServiceImpl::HasPermission(
-    PermissionName permission,
+    permission::Name permission,
     const mojo::String& origin,
     const PermissionStatusCallback& callback) {
   callback.Run(GetPermissionStatusFromName(permission, GURL(origin)));
 }
 
 void PermissionServiceImpl::RevokePermission(
-    PermissionName permission,
+    permission::Name permission,
     const mojo::String& origin,
     const PermissionStatusCallback& callback) {
   GURL origin_url(origin);
   PermissionType permission_type = PermissionNameToPermissionType(permission);
-  PermissionStatus status = GetPermissionStatusFromType(permission_type,
-                                                        origin_url);
+  permission::Status status =
+      GetPermissionStatusFromType(permission_type, origin_url);
 
   // Resetting the permission should only be possible if the permission is
   // already granted.
-  if (status != PERMISSION_STATUS_GRANTED) {
+  if (status != permission::STATUS_GRANTED) {
     callback.Run(status);
     return;
   }
@@ -220,12 +218,12 @@ void PermissionServiceImpl::RevokePermission(
 }
 
 void PermissionServiceImpl::GetNextPermissionChange(
-    PermissionName permission,
+    permission::Name permission,
     const mojo::String& mojo_origin,
-    PermissionStatus last_known_status,
+    permission::Status last_known_status,
     const PermissionStatusCallback& callback) {
   GURL origin(mojo_origin);
-  PermissionStatus current_status =
+  permission::Status current_status =
       GetPermissionStatusFromName(permission, origin);
   if (current_status != last_known_status) {
     callback.Run(current_status);
@@ -260,18 +258,20 @@ void PermissionServiceImpl::GetNextPermissionChange(
                      pending_subscription_id));
 }
 
-PermissionStatus PermissionServiceImpl::GetPermissionStatusFromName(
-    PermissionName permission, const GURL& origin) {
+permission::Status PermissionServiceImpl::GetPermissionStatusFromName(
+    permission::Name permission,
+    const GURL& origin) {
   return GetPermissionStatusFromType(PermissionNameToPermissionType(permission),
                                      origin);
 }
 
-PermissionStatus PermissionServiceImpl::GetPermissionStatusFromType(
-    PermissionType type, const GURL& origin) {
+permission::Status PermissionServiceImpl::GetPermissionStatusFromType(
+    PermissionType type,
+    const GURL& origin) {
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!browser_context->GetPermissionManager())
-    return PERMISSION_STATUS_DENIED;
+    return permission::STATUS_DENIED;
 
   // If the embedding_origin is empty we'll use |origin| instead.
   GURL embedding_origin = context_->GetEmbeddingOrigin();
@@ -294,7 +294,7 @@ void PermissionServiceImpl::ResetPermissionStatus(PermissionType type,
 
 void PermissionServiceImpl::OnPermissionStatusChanged(
     int pending_subscription_id,
-    PermissionStatus status) {
+    permission::Status status) {
   PendingSubscription* subscription =
       pending_subscriptions_.Lookup(pending_subscription_id);