Move geolocation and permission mojoms into components.

android_webview/browser/aw_permission_manager.h

Index: android_webview/browser/aw_permission_manager.h
diff --git a/android_webview/browser/aw_permission_manager.h b/android_webview/browser/aw_permission_manager.h
index ab507ce8874fa07360b6b276c4b8dfee7e96540b..1410726707ebbc7059c6435062fa15795b8b720b 100644
--- a/android_webview/browser/aw_permission_manager.h
+++ b/android_webview/browser/aw_permission_manager.h
@@ -27,15 +27,14 @@ class AwPermissionManager : public content::PermissionManager {
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       bool user_gesture,
-      const base::Callback<void(content::PermissionStatus)>& callback) override;
+      const base::Callback<void(permission::Status)>& callback) override;
   void CancelPermissionRequest(int request_id) override;
   void ResetPermission(content::PermissionType permission,
                        const GURL& requesting_origin,
                        const GURL& embedding_origin) override;
-  content::PermissionStatus GetPermissionStatus(
-      content::PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) override;
+  permission::Status GetPermissionStatus(content::PermissionType permission,
+                                         const GURL& requesting_origin,
+                                         const GURL& embedding_origin) override;
   void RegisterPermissionUsage(content::PermissionType permission,
                                const GURL& requesting_origin,
                                const GURL& embedding_origin) override;
@@ -43,7 +42,7 @@ class AwPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
-      const base::Callback<void(content::PermissionStatus)>& callback) override;
+      const base::Callback<void(permission::Status)>& callback) override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:
@@ -57,7 +56,7 @@ class AwPermissionManager : public content::PermissionManager {
   static void OnRequestResponse(
       const base::WeakPtr<AwPermissionManager>& manager,
       int request_id,
-      const base::Callback<void(content::PermissionStatus)>& callback,
+      const base::Callback<void(permission::Status)>& callback,
       bool allowed);
 
   PendingRequestsMap pending_requests_;