Add mojom module suffix in .mojom files in content.

'module content;' --> 'module content.mojom;'
This way generated bindings will consistently live in a mojom
sub-namespace and avoid collision with non-mojom types.

This CL is for these .mojom files:
content/common/leveldb_wrapper.mojom
content/common/permission_service.mojom
content/common/storage_partition_service.mojom
content/common/vr_service.mojom
content/common/wake_lock_service.mojom
content/public/common/permission_status.mojom
content/public/test/test_mojo_service.mojom
content/test/data/web_ui_test_mojo_bindings.mojom

BUG=588964
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Review URL: https://codereview.chromium.org/1832813002

Cr-Commit-Position: refs/heads/master@{#383456}

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::PermissionStatus;
+using content::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::PermissionStatus::GRANTED ||
-           status == content::PermissionStatus::DENIED);
+    DCHECK(status == content::mojom::PermissionStatus::GRANTED ||
+           status == content::mojom::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::PermissionStatus::ASK;
+      return content::mojom::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::PermissionStatus::ASK;
+      return content::mojom::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::PermissionStatus::ASK;
+      return content::mojom::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::PermissionStatus::DENIED);
+    callback.Run(content::mojom::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::PermissionStatus::DENIED);
+      callback.Run(content::mojom::PermissionStatus::DENIED);
       break;
     case PermissionType::MIDI:
-      callback.Run(content::PermissionStatus::GRANTED);
+      callback.Run(content::mojom::PermissionStatus::GRANTED);
       break;
     case PermissionType::NUM:
       NOTREACHED() << "PermissionType::NUM was not expected here.";
-      callback.Run(content::PermissionStatus::DENIED);
+      callback.Run(content::mojom::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::PermissionStatus::GRANTED
-                                    : content::PermissionStatus::DENIED;
+  PermissionStatus status = allowed ? content::mojom::PermissionStatus::GRANTED
+                                    : content::mojom::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::PermissionStatus::GRANTED;
+    return content::mojom::PermissionStatus::GRANTED;
   }
 
-  return content::PermissionStatus::DENIED;
+  return content::mojom::PermissionStatus::DENIED;
 }
 
 void AwPermissionManager::RegisterPermissionUsage(

android_webview/browser/aw_permission_manager.h

@@ -26,18 +26,20 @@ class AwPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(content::PermissionStatus)>& callback) override;
+      const base::Callback<void(content::mojom::PermissionStatus)>& callback)
+      override;
   int RequestPermissions(
-    const std::vector<content::PermissionType>& permissions,
-    content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
-    const base::Callback<void(
-        const std::vector<content::PermissionStatus>&)>& callback) override;
+      const std::vector<content::PermissionType>& permissions,
+      content::RenderFrameHost* render_frame_host,
+      const GURL& requesting_origin,
+      const base::Callback<
+          void(const std::vector<content::mojom::PermissionStatus>&)>& 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::mojom::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
@@ -48,7 +50,8 @@ 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(content::mojom::PermissionStatus)>& callback)
+      override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:
@@ -62,7 +65,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(content::mojom::PermissionStatus)>& callback,
       bool allowed);
 
   PendingRequestsMap pending_requests_;

blimp/engine/app/blimp_permission_manager.cc

@@ -21,19 +21,19 @@ int BlimpPermissionManager::RequestPermission(
     content::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& origin,
-    const base::Callback<void(content::PermissionStatus)>& callback) {
-  callback.Run(content::PermissionStatus::DENIED);
+    const base::Callback<void(content::mojom::PermissionStatus)>& callback) {
+  callback.Run(content::mojom::PermissionStatus::DENIED);
   return kNoPendingOperation;
 }
 
 int BlimpPermissionManager::RequestPermissions(
     const std::vector<content::PermissionType>& permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-    const base::Callback<void(const std::vector<content::PermissionStatus>&)>&
-        callback) {
-  callback.Run(std::vector<content::PermissionStatus>(
-      permission.size(), content::PermissionStatus::DENIED));
+    const base::Callback<
+        void(const std::vector<content::mojom::PermissionStatus>&)>& callback) {
+  callback.Run(std::vector<content::mojom::PermissionStatus>(
+      permission.size(), content::mojom::PermissionStatus::DENIED));
   return kNoPendingOperation;
 }
 
@@ -43,11 +43,11 @@ void BlimpPermissionManager::ResetPermission(content::PermissionType permission,
                                              const GURL& requesting_origin,
                                              const GURL& embedding_origin) {}
 
-content::PermissionStatus BlimpPermissionManager::GetPermissionStatus(
+content::mojom::PermissionStatus BlimpPermissionManager::GetPermissionStatus(
     content::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
-  return content::PermissionStatus::DENIED;
+  return content::mojom::PermissionStatus::DENIED;
 }
 
 void BlimpPermissionManager::RegisterPermissionUsage(
@@ -59,7 +59,7 @@ int BlimpPermissionManager::SubscribePermissionStatusChange(
     content::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
-    const base::Callback<void(content::PermissionStatus)>& callback) {
+    const base::Callback<void(content::mojom::PermissionStatus)>& callback) {
   return -1;
 }
 

blimp/engine/app/blimp_permission_manager.h

@@ -24,18 +24,20 @@ class BlimpPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(content::PermissionStatus)>& callback) override;
+      const base::Callback<void(content::mojom::PermissionStatus)>& callback)
+      override;
   int RequestPermissions(
       const std::vector<content::PermissionType>& permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(const std::vector<content::PermissionStatus>&)>&
-          callback) override;
+      const base::Callback<
+          void(const std::vector<content::mojom::PermissionStatus>&)>& 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::mojom::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
@@ -46,7 +48,8 @@ class BlimpPermissionManager : 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(content::mojom::PermissionStatus)>& callback)
+      override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:

chrome/browser/notifications/notification_permission_context_unittest.cc

@@ -28,7 +28,7 @@
 namespace {
 
 void DoNothing(ContentSetting content_setting) {}
-void DoNothing2(content::PermissionStatus status) {}
+void DoNothing2(content::mojom::PermissionStatus status) {}
 
 class TestNotificationPermissionContext : public NotificationPermissionContext {
  public:

chrome/browser/permissions/permission_manager.cc

@@ -24,7 +24,7 @@
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #endif
 
-using content::PermissionStatus;
+using content::mojom::PermissionStatus;
 using content::PermissionType;
 
 namespace {
@@ -34,19 +34,19 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) {
   switch (setting) {
     case CONTENT_SETTING_ALLOW:
     case CONTENT_SETTING_SESSION_ONLY:
-      return content::PermissionStatus::GRANTED;
+      return content::mojom::PermissionStatus::GRANTED;
     case CONTENT_SETTING_BLOCK:
-      return content::PermissionStatus::DENIED;
+      return content::mojom::PermissionStatus::DENIED;
     case CONTENT_SETTING_ASK:
-      return content::PermissionStatus::ASK;
+      return content::mojom::PermissionStatus::ASK;
     case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
     case CONTENT_SETTING_DEFAULT:
     case CONTENT_SETTING_NUM_SETTINGS:
       break;
   }
 
   NOTREACHED();
-  return content::PermissionStatus::DENIED;
+  return content::mojom::PermissionStatus::DENIED;
 }
 
 // Wrap a callback taking a PermissionStatus to pass it as a callback taking a
@@ -148,7 +148,7 @@ class PermissionManager::PendingRequest {
         render_frame_id_(render_frame_host->GetRoutingID()),
         callback_(callback),
         permissions_(permissions),
-        results_(permissions.size(), content::PermissionStatus::DENIED),
+        results_(permissions.size(), content::mojom::PermissionStatus::DENIED),
         remaining_results_(permissions.size()) {}
 
   void SetPermissionStatus(int permission_id, PermissionStatus status) {
@@ -326,7 +326,7 @@ PermissionStatus PermissionManager::GetPermissionStatus(
 
   PermissionContextBase* context = PermissionContext::Get(profile_, permission);
   if (!context)
-    return content::PermissionStatus::DENIED;
+    return content::mojom::PermissionStatus::DENIED;
 
   return ContentSettingToPermissionStatus(context->GetPermissionStatus(
       requesting_origin.GetOrigin(), embedding_origin.GetOrigin()));

chrome/browser/permissions/permission_manager.h

@@ -33,18 +33,20 @@ class PermissionManager : public KeyedService,
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(content::PermissionStatus)>& callback) override;
+      const base::Callback<void(content::mojom::PermissionStatus)>& callback)
+      override;
   int RequestPermissions(
       const std::vector<content::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(
-          const std::vector<content::PermissionStatus>&)>& callback) override;
+      const base::Callback<
+          void(const std::vector<content::mojom::PermissionStatus>&)>& 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::mojom::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
@@ -55,7 +57,8 @@ class PermissionManager : public KeyedService,
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
-      const base::Callback<void(content::PermissionStatus)>& callback) override;
+      const base::Callback<void(content::mojom::PermissionStatus)>& callback)
+      override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:
@@ -74,7 +77,7 @@ class PermissionManager : public KeyedService,
   void OnPermissionsRequestResponseStatus(
       int request_id,
       int permission_id,
-      content::PermissionStatus status);
+      content::mojom::PermissionStatus status);
 
   // Not all WebContents are able to display permission requests. If the PBM
   // is required but missing for |web_contents|, don't pass along the request.