Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/

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 0a795b4f2628aad29407c11b114285d37fc0fc2b..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 @@
 
 struct LayoutTestPermissionManager::Subscription {
   PermissionDescription permission;
-  base::Callback<void(permissions::mojom::PermissionStatus)> callback;
-  permissions::mojom::PermissionStatus current_value;
+  base::Callback<void(blink::mojom::PermissionStatus)> callback;
+  blink::mojom::PermissionStatus current_value;
 };
 
 LayoutTestPermissionManager::PermissionDescription::PermissionDescription(
@@ -65,8 +65,7 @@
     PermissionType permission,
     RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-    const base::Callback<void(permissions::mojom::PermissionStatus)>&
-        callback) {
+    const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   callback.Run(GetPermissionStatus(
@@ -80,11 +79,11 @@
     const std::vector<PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-    const base::Callback<void(
-        const std::vector<permissions::mojom::PermissionStatus>&)>& callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  std::vector<permissions::mojom::PermissionStatus> result(permissions.size());
+    const base::Callback<
+        void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  std::vector<blink::mojom::PermissionStatus> result(permissions.size());
   const GURL& embedding_origin =
       WebContents::FromRenderFrameHost(render_frame_host)
           ->GetLastCommittedURL().GetOrigin();
@@ -116,10 +115,10 @@
   permissions_.erase(it);
 }
 
-permissions::mojom::PermissionStatus
-LayoutTestPermissionManager::GetPermissionStatus(PermissionType permission,
-                                                 const GURL& requesting_origin,
-                                                 const GURL& embedding_origin) {
+blink::mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus(
+    PermissionType permission,
+    const GURL& requesting_origin,
+    const GURL& embedding_origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ -128,7 +127,7 @@
   auto it = permissions_.find(
       PermissionDescription(permission, requesting_origin, embedding_origin));
   if (it == permissions_.end())
-    return permissions::mojom::PermissionStatus::DENIED;
+    return blink::mojom::PermissionStatus::DENIED;
   return it->second;
 }
 
@@ -143,8 +142,7 @@
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
-    const base::Callback<void(permissions::mojom::PermissionStatus)>&
-        callback) {
+    const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Subscription* subscription = new Subscription();
@@ -169,7 +167,7 @@
 
 void LayoutTestPermissionManager::SetPermission(
     PermissionType permission,
-    permissions::mojom::PermissionStatus status,
+    blink::mojom::PermissionStatus status,
     const GURL& origin,
     const GURL& embedding_origin) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -181,7 +179,7 @@
   auto it = permissions_.find(description);
   if (it == permissions_.end()) {
     permissions_.insert(
-        std::pair<PermissionDescription, permissions::mojom::PermissionStatus>(
+        std::pair<PermissionDescription, blink::mojom::PermissionStatus>(
             description, status));
   } else {
     it->second = status;
@@ -199,7 +197,7 @@
 
 void LayoutTestPermissionManager::OnPermissionChanged(
     const PermissionDescription& permission,
-    permissions::mojom::PermissionStatus status) {
+    blink::mojom::PermissionStatus status) {
   std::list<base::Closure> callbacks;
 
   for (SubscriptionsMap::iterator iter(&subscriptions_);