Move geolocation and permission mojoms into components.

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 cd15346da62104ea270f0960dae5dfd470238ca7..14b8c933d2c980ae6b20661b5c71c67c2e0b1377 100644
--- a/android_webview/browser/aw_permission_manager.cc
+++ b/android_webview/browser/aw_permission_manager.cc
@@ -15,7 +15,6 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
-using content::PermissionStatus;
 using content::PermissionType;
 
 namespace android_webview {
@@ -27,9 +26,9 @@ class LastRequestResultCache {
   void SetResult(PermissionType permission,
                  const GURL& requesting_origin,
                  const GURL& embedding_origin,
-                 PermissionStatus status) {
-    DCHECK(status == content::PERMISSION_STATUS_GRANTED ||
-           status == content::PERMISSION_STATUS_DENIED);
+                 permission::Status status) {
+    DCHECK(status == permission::STATUS_GRANTED ||
+           status == permission::STATUS_DENIED);
 
     // TODO(ddorwin): We should be denying empty origins at a higher level.
     if (requesting_origin.is_empty() || embedding_origin.is_empty()) {
@@ -61,12 +60,12 @@ class LastRequestResultCache {
     pmi_result_cache_[key] = status;
   }
 
-  PermissionStatus GetResult(PermissionType permission,
-                             const GURL& requesting_origin,
-                             const GURL& embedding_origin) const {
+  permission::Status GetResult(PermissionType permission,
+                               const GURL& requesting_origin,
+                               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::PERMISSION_STATUS_ASK;
+      return permission::STATUS_ASK;
     }
 
     DCHECK(requesting_origin.is_valid())
@@ -76,14 +75,14 @@ class LastRequestResultCache {
 
     if (permission != PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
       NOTREACHED() << "Results are only cached for PROTECTED_MEDIA_IDENTIFIER";
-      return content::PERMISSION_STATUS_ASK;
+      return permission::STATUS_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::PERMISSION_STATUS_ASK;
+      return permission::STATUS_ASK;
     }
 
     DCHECK(!key.empty());
@@ -125,7 +124,7 @@ class LastRequestResultCache {
     return requesting + "," + embedding;
   }
 
-  using StatusMap = base::hash_map<std::string, PermissionStatus>;
+  using StatusMap = base::hash_map<std::string, permission::Status>;
   StatusMap pmi_result_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(LastRequestResultCache);
@@ -137,7 +136,7 @@ struct AwPermissionManager::PendingRequest {
                  GURL requesting_origin,
                  GURL embedding_origin,
                  content::RenderFrameHost* render_frame_host,
-                 const base::Callback<void(PermissionStatus)>& callback)
+                 const base::Callback<void(permission::Status)>& callback)
     : permission(permission),
       requesting_origin(requesting_origin),
       embedding_origin(embedding_origin),
@@ -153,7 +152,7 @@ struct AwPermissionManager::PendingRequest {
   GURL embedding_origin;
   int render_process_id;
   int render_frame_id;
-  base::Callback<void(PermissionStatus)> callback;
+  base::Callback<void(permission::Status)> callback;
 };
 
 AwPermissionManager::AwPermissionManager()
@@ -170,7 +169,7 @@ int AwPermissionManager::RequestPermission(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     bool user_gesture,
-    const base::Callback<void(PermissionStatus)>& callback) {
+    const base::Callback<void(permission::Status)>& callback) {
   int render_process_id = render_frame_host->GetProcess()->GetID();
   int render_frame_id = render_frame_host->GetRoutingID();
   AwBrowserPermissionRequestDelegate* delegate =
@@ -179,7 +178,7 @@ int AwPermissionManager::RequestPermission(
   if (!delegate) {
     DVLOG(0) << "Dropping permission request for "
              << static_cast<int>(permission);
-    callback.Run(content::PERMISSION_STATUS_DENIED);
+    callback.Run(permission::STATUS_DENIED);
     return kNoPendingOperation;
   }
 
@@ -245,14 +244,14 @@ int AwPermissionManager::RequestPermission(
     case PermissionType::DURABLE_STORAGE:
       NOTIMPLEMENTED() << "RequestPermission is not implemented for "
                        << static_cast<int>(permission);
-      callback.Run(content::PERMISSION_STATUS_DENIED);
+      callback.Run(permission::STATUS_DENIED);
       break;
     case PermissionType::MIDI:
-      callback.Run(content::PERMISSION_STATUS_GRANTED);
+      callback.Run(permission::STATUS_GRANTED);
       break;
     case PermissionType::NUM:
       NOTREACHED() << "PermissionType::NUM was not expected here.";
-      callback.Run(content::PERMISSION_STATUS_DENIED);
+      callback.Run(permission::STATUS_DENIED);
       break;
   }
   return request_id;
@@ -262,10 +261,10 @@ int AwPermissionManager::RequestPermission(
 void AwPermissionManager::OnRequestResponse(
     const base::WeakPtr<AwPermissionManager>& manager,
     int request_id,
-    const base::Callback<void(PermissionStatus)>& callback,
+    const base::Callback<void(permission::Status)>& callback,
     bool allowed) {
-  PermissionStatus status = allowed ? content::PERMISSION_STATUS_GRANTED
-                                    : content::PERMISSION_STATUS_DENIED;
+  permission::Status status =
+      allowed ? permission::STATUS_GRANTED : permission::STATUS_DENIED;
   if (manager.get()) {
     PendingRequest* pending_request =
         manager->pending_requests_.Lookup(request_id);
@@ -359,7 +358,7 @@ void AwPermissionManager::ResetPermission(PermissionType permission,
   result_cache_->ClearResult(permission, requesting_origin, embedding_origin);
 }
 
-PermissionStatus AwPermissionManager::GetPermissionStatus(
+permission::Status AwPermissionManager::GetPermissionStatus(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
@@ -368,10 +367,10 @@ PermissionStatus AwPermissionManager::GetPermissionStatus(
     return result_cache_->GetResult(permission, requesting_origin,
                                     embedding_origin);
   } else if (permission == PermissionType::MIDI) {
-    return content::PERMISSION_STATUS_GRANTED;
+    return permission::STATUS_GRANTED;
   }
 
-  return content::PERMISSION_STATUS_DENIED;
+  return permission::STATUS_DENIED;
 }
 
 void AwPermissionManager::RegisterPermissionUsage(
@@ -384,7 +383,7 @@ int AwPermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
-    const base::Callback<void(PermissionStatus)>& callback) {
+    const base::Callback<void(permission::Status)>& callback) {
   return kNoPendingOperation;
 }