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

content/shell/browser/layout_test/layout_test_permission_manager.cc

Index: content/shell/browser/layout_test/layout_test_permission_manager.cc
diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.cc b/content/shell/browser/layout_test/layout_test_permission_manager.cc
index 7b31f37bb7d237dc95a8e3ff7743ee2965a9a6b7..beafee559b5c8769a6c1114860d65210ef6c7a6f 100644
--- a/content/shell/browser/layout_test/layout_test_permission_manager.cc
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.cc
@@ -18,8 +18,8 @@ namespace content {
 
 struct LayoutTestPermissionManager::Subscription {
   PermissionDescription permission;
-  base::Callback<void(content::mojom::PermissionStatus)> callback;
-  mojom::PermissionStatus current_value;
+  base::Callback<void(blink::mojom::PermissionStatus)> callback;
+  blink::mojom::PermissionStatus current_value;
 };
 
 LayoutTestPermissionManager::PermissionDescription::PermissionDescription(
@@ -65,7 +65,7 @@ int LayoutTestPermissionManager::RequestPermission(
     PermissionType permission,
     RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-    const base::Callback<void(mojom::PermissionStatus)>& callback) {
+    const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   callback.Run(GetPermissionStatus(
@@ -79,11 +79,11 @@ int LayoutTestPermissionManager::RequestPermissions(
     const std::vector<PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-    const base::Callback<void(const std::vector<mojom::PermissionStatus>&)>&
-        callback) {
+    const base::Callback<
+        void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  std::vector<mojom::PermissionStatus> result(permissions.size());
+  std::vector<blink::mojom::PermissionStatus> result(permissions.size());
   const GURL& embedding_origin =
       WebContents::FromRenderFrameHost(render_frame_host)
           ->GetLastCommittedURL().GetOrigin();
@@ -115,7 +115,7 @@ void LayoutTestPermissionManager::ResetPermission(
   permissions_.erase(it);
 }
 
-mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus(
+blink::mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
@@ -127,7 +127,7 @@ mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus(
   auto it = permissions_.find(
       PermissionDescription(permission, requesting_origin, embedding_origin));
   if (it == permissions_.end())
-    return mojom::PermissionStatus::DENIED;
+    return blink::mojom::PermissionStatus::DENIED;
   return it->second;
 }
 
@@ -142,7 +142,7 @@ int LayoutTestPermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
-    const base::Callback<void(mojom::PermissionStatus)>& callback) {
+    const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Subscription* subscription = new Subscription();
@@ -165,10 +165,11 @@ void LayoutTestPermissionManager::UnsubscribePermissionStatusChange(
   subscriptions_.Remove(subscription_id);
 }
 
-void LayoutTestPermissionManager::SetPermission(PermissionType permission,
-                                                mojom::PermissionStatus status,
-                                                const GURL& origin,
-                                                const GURL& embedding_origin) {
+void LayoutTestPermissionManager::SetPermission(
+    PermissionType permission,
+    blink::mojom::PermissionStatus status,
+    const GURL& origin,
+    const GURL& embedding_origin) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   PermissionDescription description(permission, origin, embedding_origin);
@@ -178,8 +179,8 @@ void LayoutTestPermissionManager::SetPermission(PermissionType permission,
   auto it = permissions_.find(description);
   if (it == permissions_.end()) {
     permissions_.insert(
-        std::pair<PermissionDescription, mojom::PermissionStatus>(description,
-                                                                  status));
+        std::pair<PermissionDescription, blink::mojom::PermissionStatus>(
+            description, status));
   } else {
     it->second = status;
   }
@@ -196,7 +197,7 @@ void LayoutTestPermissionManager::ResetPermissions() {
 
 void LayoutTestPermissionManager::OnPermissionChanged(
     const PermissionDescription& permission,
-    mojom::PermissionStatus status) {
+    blink::mojom::PermissionStatus status) {
   std::list<base::Closure> callbacks;
 
   for (SubscriptionsMap::iterator iter(&subscriptions_);