Move geolocation and permission mojoms into components.

content/child/permissions/permission_dispatcher.h

Index: content/child/permissions/permission_dispatcher.h
diff --git a/content/child/permissions/permission_dispatcher.h b/content/child/permissions/permission_dispatcher.h
index 6cec47ba5b56603b796507ccc75adf63ae0859c1..22b5c6ffa33ffa36291daddae2d8acc1ea964591 100644
--- a/content/child/permissions/permission_dispatcher.h
+++ b/content/child/permissions/permission_dispatcher.h
@@ -11,8 +11,8 @@
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "components/permission/public/interfaces/permission.mojom.h"
 #include "content/child/permissions/permission_observers_registry.h"
-#include "content/common/permission_service.mojom.h"
 #include "third_party/WebKit/public/platform/modules/permissions/WebPermissionClient.h"
 
 namespace content {
@@ -100,8 +100,8 @@ class PermissionDispatcher : public blink::WebPermissionClient,
       scoped_ptr<blink::WebPermissionsCallback> callback,
       scoped_ptr<blink::WebVector<blink::WebPermissionStatus>> statuses);
 
-  // Helper method that returns an initialized PermissionServicePtr.
-  PermissionServicePtr& GetPermissionServicePtr();
+  // Helper method that returns an initialized permission::PermissionServicePtr.
+  permission::PermissionServicePtr& GetPermissionServicePtr();
 
   void QueryPermissionInternal(blink::WebPermissionType type,
                                const std::string& origin,
@@ -124,24 +124,24 @@ class PermissionDispatcher : public blink::WebPermissionClient,
   // This is the callback function used for query, request and revoke.
   void OnPermissionResponse(int worker_thread_id,
                             uintptr_t callback_key,
-                            PermissionStatus status);
+                            permission::Status status);
   void OnRequestPermissionsResponse(
       int worker_thread_id,
       uintptr_t callback_key,
-      const mojo::Array<PermissionStatus>& status);
+      const mojo::Array<permission::Status>& status);
   void OnPermissionChanged(blink::WebPermissionType type,
                            const std::string& origin,
                            blink::WebPermissionObserver* observer,
-                           PermissionStatus status);
+                           permission::Status status);
   void OnPermissionChangedForWorker(
       int worker_thread_id,
       const base::Callback<void(blink::WebPermissionStatus)>& callback,
-      PermissionStatus status);
+      permission::Status status);
 
   void GetNextPermissionChange(blink::WebPermissionType type,
                                const std::string& origin,
                                blink::WebPermissionObserver* observer,
-                               PermissionStatus current_status);
+                               permission::Status current_status);
 
   // Pending callbacks for query(), revoke() and request() single permission.
   PermissionCallbackMap permission_callbacks_;
@@ -150,7 +150,7 @@ class PermissionDispatcher : public blink::WebPermissionClient,
   PermissionsCallbackMap permissions_callbacks_;
 
   ServiceRegistry* service_registry_;
-  PermissionServicePtr permission_service_;
+  permission::PermissionServicePtr permission_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionDispatcher);
 };