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

android_webview/browser/aw_permission_manager.cc

Index: android_webview/browser/aw_permission_manager.cc
diff --git a/android_webview/browser/aw_permission_manager.cc b/android_webview/browser/aw_permission_manager.cc
index f7e643a2213a18528087dd41927c4ce65f769976..b86f1a43c0e190bad2f8488667aa7f7752c1a0e1 100644
--- a/android_webview/browser/aw_permission_manager.cc
+++ b/android_webview/browser/aw_permission_manager.cc
@@ -15,7 +15,7 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
-using content::mojom::PermissionStatus;
+using blink::mojom::PermissionStatus;
 using content::PermissionType;
 
 namespace android_webview {
@@ -28,8 +28,8 @@ class LastRequestResultCache {
                  const GURL& requesting_origin,
                  const GURL& embedding_origin,
                  PermissionStatus status) {
-    DCHECK(status == content::mojom::PermissionStatus::GRANTED ||
-           status == content::mojom::PermissionStatus::DENIED);
+    DCHECK(status == PermissionStatus::GRANTED ||
+           status == PermissionStatus::DENIED);
 
     // TODO(ddorwin): We should be denying empty origins at a higher level.
     if (requesting_origin.is_empty() || embedding_origin.is_empty()) {
@@ -66,7 +66,7 @@ class LastRequestResultCache {
                              const GURL& embedding_origin) const {
     // TODO(ddorwin): We should be denying empty origins at a higher level.
     if (requesting_origin.is_empty() || embedding_origin.is_empty()) {
-      return content::mojom::PermissionStatus::ASK;
+      return PermissionStatus::ASK;
     }
 
     DCHECK(requesting_origin.is_valid())
@@ -76,14 +76,14 @@ class LastRequestResultCache {
 
     if (permission != PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
       NOTREACHED() << "Results are only cached for PROTECTED_MEDIA_IDENTIFIER";
-      return content::mojom::PermissionStatus::ASK;
+      return PermissionStatus::ASK;
     }
 
     std::string key = GetCacheKey(requesting_origin, embedding_origin);
     StatusMap::const_iterator it = pmi_result_cache_.find(key);
     if (it == pmi_result_cache_.end()) {
       DLOG(WARNING) << "GetResult() called for uncached origins: " << key;
-      return content::mojom::PermissionStatus::ASK;
+      return PermissionStatus::ASK;
     }
 
     DCHECK(!key.empty());
@@ -178,7 +178,7 @@ int AwPermissionManager::RequestPermission(
   if (!delegate) {
     DVLOG(0) << "Dropping permission request for "
              << static_cast<int>(permission);
-    callback.Run(content::mojom::PermissionStatus::DENIED);
+    callback.Run(PermissionStatus::DENIED);
     return kNoPendingOperation;
   }
 
@@ -245,14 +245,14 @@ int AwPermissionManager::RequestPermission(
     case PermissionType::BACKGROUND_SYNC:
       NOTIMPLEMENTED() << "RequestPermission is not implemented for "
                        << static_cast<int>(permission);
-      callback.Run(content::mojom::PermissionStatus::DENIED);
+      callback.Run(PermissionStatus::DENIED);
       break;
     case PermissionType::MIDI:
-      callback.Run(content::mojom::PermissionStatus::GRANTED);
+      callback.Run(PermissionStatus::GRANTED);
       break;
     case PermissionType::NUM:
       NOTREACHED() << "PermissionType::NUM was not expected here.";
-      callback.Run(content::mojom::PermissionStatus::DENIED);
+      callback.Run(PermissionStatus::DENIED);
       break;
   }
   return request_id;
@@ -286,8 +286,8 @@ void AwPermissionManager::OnRequestResponse(
     int request_id,
     const base::Callback<void(PermissionStatus)>& callback,
     bool allowed) {
-  PermissionStatus status = allowed ? content::mojom::PermissionStatus::GRANTED
-                                    : content::mojom::PermissionStatus::DENIED;
+  PermissionStatus status =
+      allowed ? PermissionStatus::GRANTED : PermissionStatus::DENIED;
   if (manager.get()) {
     PendingRequest* pending_request =
         manager->pending_requests_.Lookup(request_id);
@@ -391,10 +391,10 @@ PermissionStatus AwPermissionManager::GetPermissionStatus(
     return result_cache_->GetResult(permission, requesting_origin,
                                     embedding_origin);
   } else if (permission == PermissionType::MIDI) {
-    return content::mojom::PermissionStatus::GRANTED;
+    return PermissionStatus::GRANTED;
   }
 
-  return content::mojom::PermissionStatus::DENIED;
+  return PermissionStatus::DENIED;
 }
 
 void AwPermissionManager::RegisterPermissionUsage(