Move geolocation and permission mojoms into components.

content/child/permissions/permission_dispatcher.cc

Index: content/child/permissions/permission_dispatcher.cc
diff --git a/content/child/permissions/permission_dispatcher.cc b/content/child/permissions/permission_dispatcher.cc
index 4c2e054e0cf5b8229bd507016c9871a0c6c9c457..70b71bdad546692a23bd21a10f267ad41e818a79 100644
--- a/content/child/permissions/permission_dispatcher.cc
+++ b/content/child/permissions/permission_dispatcher.cc
@@ -17,49 +17,49 @@ namespace content {
 
 namespace {
 
-PermissionName GetPermissionName(blink::WebPermissionType type) {
+permission::Name GetPermissionName(blink::WebPermissionType type) {
   switch (type) {
     case blink::WebPermissionTypeGeolocation:
-      return PERMISSION_NAME_GEOLOCATION;
+      return permission::NAME_GEOLOCATION;
     case blink::WebPermissionTypeNotifications:
-      return PERMISSION_NAME_NOTIFICATIONS;
+      return permission::NAME_NOTIFICATIONS;
     case blink::WebPermissionTypePushNotifications:
-      return PERMISSION_NAME_PUSH_NOTIFICATIONS;
+      return permission::NAME_PUSH_NOTIFICATIONS;
     case blink::WebPermissionTypeMidiSysEx:
-      return PERMISSION_NAME_MIDI_SYSEX;
+      return permission::NAME_MIDI_SYSEX;
     case blink::WebPermissionTypeDurableStorage:
-        return PERMISSION_NAME_DURABLE_STORAGE;
+      return permission::NAME_DURABLE_STORAGE;
     case blink::WebPermissionTypeMidi:
-      return PERMISSION_NAME_MIDI;
+      return permission::NAME_MIDI;
     default:
       // The default statement is only there to prevent compilation failures if
       // WebPermissionType enum gets extended.
       NOTREACHED();
-      return PERMISSION_NAME_GEOLOCATION;
+      return permission::NAME_GEOLOCATION;
   }
 }
 
-PermissionStatus GetPermissionStatus(blink::WebPermissionStatus status) {
+permission::Status GetPermissionStatus(blink::WebPermissionStatus status) {
   switch (status) {
     case blink::WebPermissionStatusGranted:
-      return PERMISSION_STATUS_GRANTED;
+      return permission::STATUS_GRANTED;
     case blink::WebPermissionStatusDenied:
-      return PERMISSION_STATUS_DENIED;
+      return permission::STATUS_DENIED;
     case blink::WebPermissionStatusPrompt:
-      return PERMISSION_STATUS_ASK;
+      return permission::STATUS_ASK;
   }
 
   NOTREACHED();
-  return PERMISSION_STATUS_DENIED;
+  return permission::STATUS_DENIED;
 }
 
-blink::WebPermissionStatus GetWebPermissionStatus(PermissionStatus status) {
+blink::WebPermissionStatus GetWebPermissionStatus(permission::Status status) {
   switch (status) {
-    case PERMISSION_STATUS_GRANTED:
+    case permission::STATUS_GRANTED:
       return blink::WebPermissionStatusGranted;
-    case PERMISSION_STATUS_DENIED:
+    case permission::STATUS_DENIED:
       return blink::WebPermissionStatusDenied;
-    case PERMISSION_STATUS_ASK:
+    case permission::STATUS_ASK:
       return blink::WebPermissionStatusPrompt;
   }
 
@@ -127,16 +127,14 @@ void PermissionDispatcher::startListening(
 
   RegisterObserver(observer);
 
-  GetNextPermissionChange(type,
-                          origin.string().utf8(),
-                          observer,
+  GetNextPermissionChange(type, origin.string().utf8(), observer,
                           // We initialize with an arbitrary value because the
                           // mojo service wants a value. Worst case, the
                           // observer will get notified about a non-change which
                           // should be a no-op. After the first notification,
                           // GetNextPermissionChange will be called with the
                           // latest known value.
-                          PERMISSION_STATUS_ASK);
+                          permission::STATUS_ASK);
 }
 
 void PermissionDispatcher::stopListening(WebPermissionObserver* observer) {
@@ -181,17 +179,14 @@ void PermissionDispatcher::StartListeningForWorker(
     int worker_thread_id,
     const base::Callback<void(blink::WebPermissionStatus)>& callback) {
   GetPermissionServicePtr()->GetNextPermissionChange(
-      GetPermissionName(type),
-      origin,
+      GetPermissionName(type), origin,
       // We initialize with an arbitrary value because the mojo service wants a
       // value. Worst case, the observer will get notified about a non-change
       // which should be a no-op. After the first notification,
       // GetNextPermissionChange will be called with the latest known value.
-      PERMISSION_STATUS_ASK,
+      permission::STATUS_ASK,
       base::Bind(&PermissionDispatcher::OnPermissionChangedForWorker,
-                 base::Unretained(this),
-                 worker_thread_id,
-                 callback));
+                 base::Unretained(this), worker_thread_id, callback));
 }
 
 void PermissionDispatcher::GetNextPermissionChangeForWorker(
@@ -223,7 +218,8 @@ void PermissionDispatcher::RunPermissionsCallbackOnWorkerThread(
   callback->onSuccess(blink::adoptWebPtr(statuses.release()));
 }
 
-PermissionServicePtr& PermissionDispatcher::GetPermissionServicePtr() {
+permission::PermissionServicePtr&
+PermissionDispatcher::GetPermissionServicePtr() {
   if (!permission_service_.get()) {
     service_registry_->ConnectToRemoteService(
         mojo::GetProxy(&permission_service_));
@@ -289,7 +285,7 @@ void PermissionDispatcher::RequestPermissionsInternal(
   permissions_callbacks_.add(callback_key,
       scoped_ptr<blink::WebPermissionsCallback>(callback));
 
-  mojo::Array<PermissionName> names(types.size());
+  mojo::Array<permission::Name> names(types.size());
   for (size_t i = 0; i < types.size(); ++i)
     names[i] = GetPermissionName(types[i]);
 
@@ -325,10 +321,9 @@ void PermissionDispatcher::RevokePermissionInternal(
                  callback_key));
 }
 
-void PermissionDispatcher::OnPermissionResponse(
-    int worker_thread_id,
-    uintptr_t callback_key,
-    PermissionStatus result) {
+void PermissionDispatcher::OnPermissionResponse(int worker_thread_id,
+                                                uintptr_t callback_key,
+                                                permission::Status result) {
   scoped_ptr<blink::WebPermissionCallback> callback =
       permission_callbacks_.take_and_erase(callback_key);
   blink::WebPermissionStatus status = GetWebPermissionStatus(result);
@@ -349,7 +344,7 @@ void PermissionDispatcher::OnPermissionResponse(
 void PermissionDispatcher::OnRequestPermissionsResponse(
     int worker_thread_id,
     uintptr_t callback_key,
-    const mojo::Array<PermissionStatus>& result) {
+    const mojo::Array<permission::Status>& result) {
   scoped_ptr<blink::WebPermissionsCallback> callback =
       permissions_callbacks_.take_and_erase(callback_key);
   scoped_ptr<blink::WebVector<blink::WebPermissionStatus>> statuses(
@@ -372,11 +367,10 @@ void PermissionDispatcher::OnRequestPermissionsResponse(
   callback->onSuccess(blink::adoptWebPtr(statuses.release()));
 }
 
-void PermissionDispatcher::OnPermissionChanged(
-    blink::WebPermissionType type,
-    const std::string& origin,
-    WebPermissionObserver* observer,
-    PermissionStatus status) {
+void PermissionDispatcher::OnPermissionChanged(blink::WebPermissionType type,
+                                               const std::string& origin,
+                                               WebPermissionObserver* observer,
+                                               permission::Status status) {
   if (!IsObserverRegistered(observer))
     return;
 
@@ -388,7 +382,7 @@ void PermissionDispatcher::OnPermissionChanged(
 void PermissionDispatcher::OnPermissionChangedForWorker(
     int worker_thread_id,
     const base::Callback<void(blink::WebPermissionStatus)>& callback,
-    PermissionStatus status) {
+    permission::Status status) {
   DCHECK(worker_thread_id != kNoWorkerThread);
 
   WorkerTaskRunner::Instance()->PostTask(
@@ -399,7 +393,7 @@ void PermissionDispatcher::GetNextPermissionChange(
     blink::WebPermissionType type,
     const std::string& origin,
     WebPermissionObserver* observer,
-    PermissionStatus current_status) {
+    permission::Status current_status) {
   GetPermissionServicePtr()->GetNextPermissionChange(
       GetPermissionName(type),
       origin,