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

… to components/ (patchset chromium#3 id:40001 of https://codereview.chromium.org/1942353002/ ) Reason for revert: Sorry, it's causing failures on many bots, reliably on Google Chrome OS bot: https://build.chromium.org/p/chromium.chrome/buildstatus?builder=Google%20Chrome%20ChromeOS&number=17561 Original issue's description: > (reland) Move permission.mojom from WebKit/public/platform/ to components/ > > This reverts commit e1a1e4e with fix. > > Mojo permission interface is needed by other parts of Chromium, e.g. > media. > Hence move it to a more common place. > > BUG=604503 > TBR=mlamouri@chromium.org,dcheng@chromium.org > TEST=No functionality change. > CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation > > Committed: https://crrev.com/f3b224aa8873e952b12a9d058155e2070a4c4305 > Cr-Commit-Position: refs/heads/master@{#391441} TBR=jam@chromium.org,dcheng@chromium.org,mlamouri@chromium.org,xhwang@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=604503 Review-Url: https://codereview.chromium.org/1943963004 Cr-Commit-Position: refs/heads/master@{#391514}
Denger-Network · May 4, 2016 · cc29ae5 · cc29ae5
1 parent b857394
commit cc29ae5
Show file tree

Hide file tree

Showing 104 changed files with 355 additions and 454 deletions.
diff --git 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 permissions::mojom::PermissionStatus;
+using blink::mojom::PermissionStatus;
 using content::PermissionType;
 
 namespace android_webview {

diff --git a/android_webview/browser/aw_permission_manager.h b/android_webview/browser/aw_permission_manager.h
@@ -27,20 +27,20 @@ class AwPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(permissions::mojom::PermissionStatus)>&
-          callback) override;
+      const base::Callback<void(blink::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<permissions::mojom::PermissionStatus>&)>& callback)
+      const base::Callback<
+          void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
       override;
   void CancelPermissionRequest(int request_id) override;
   void ResetPermission(content::PermissionType permission,
                        const GURL& requesting_origin,
                        const GURL& embedding_origin) override;
-  permissions::mojom::PermissionStatus GetPermissionStatus(
+  blink::mojom::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
@@ -51,8 +51,8 @@ class AwPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
-      const base::Callback<void(permissions::mojom::PermissionStatus)>&
-          callback) override;
+      const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+      override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:
@@ -66,8 +66,7 @@ class AwPermissionManager : public content::PermissionManager {
   static void OnRequestResponse(
       const base::WeakPtr<AwPermissionManager>& manager,
       int request_id,
-      const base::Callback<void(permissions::mojom::PermissionStatus)>&
-          callback,
+      const base::Callback<void(blink::mojom::PermissionStatus)>& callback,
       bool allowed);
 
   PendingRequestsMap pending_requests_;

diff --git a/blimp/engine/app/blimp_permission_manager.cc b/blimp/engine/app/blimp_permission_manager.cc
@@ -21,20 +21,19 @@ int BlimpPermissionManager::RequestPermission(
     content::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& origin,
-    const base::Callback<void(permissions::mojom::PermissionStatus)>&
-        callback) {
-  callback.Run(permissions::mojom::PermissionStatus::DENIED);
+    const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
+  callback.Run(blink::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<permissions::mojom::PermissionStatus>&)>& callback) {
-  callback.Run(std::vector<permissions::mojom::PermissionStatus>(
-      permission.size(), permissions::mojom::PermissionStatus::DENIED));
+    const base::Callback<
+        void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
+  callback.Run(std::vector<blink::mojom::PermissionStatus>(
+      permission.size(), blink::mojom::PermissionStatus::DENIED));
   return kNoPendingOperation;
 }
 
@@ -44,11 +43,11 @@ void BlimpPermissionManager::ResetPermission(content::PermissionType permission,
                                              const GURL& requesting_origin,
                                              const GURL& embedding_origin) {}
 
-permissions::mojom::PermissionStatus
-BlimpPermissionManager::GetPermissionStatus(content::PermissionType permission,
-                                            const GURL& requesting_origin,
-                                            const GURL& embedding_origin) {
-  return permissions::mojom::PermissionStatus::DENIED;
+blink::mojom::PermissionStatus BlimpPermissionManager::GetPermissionStatus(
+    content::PermissionType permission,
+    const GURL& requesting_origin,
+    const GURL& embedding_origin) {
+  return blink::mojom::PermissionStatus::DENIED;
 }
 
 void BlimpPermissionManager::RegisterPermissionUsage(
@@ -60,8 +59,7 @@ int BlimpPermissionManager::SubscribePermissionStatusChange(
     content::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) {
   return -1;
 }
 

diff --git a/blimp/engine/app/blimp_permission_manager.h b/blimp/engine/app/blimp_permission_manager.h
@@ -24,20 +24,20 @@ class BlimpPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(permissions::mojom::PermissionStatus)>&
-          callback) override;
+      const base::Callback<void(blink::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<permissions::mojom::PermissionStatus>&)>& callback)
+      const base::Callback<
+          void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
       override;
   void CancelPermissionRequest(int request_id) override;
   void ResetPermission(content::PermissionType permission,
                        const GURL& requesting_origin,
                        const GURL& embedding_origin) override;
-  permissions::mojom::PermissionStatus GetPermissionStatus(
+  blink::mojom::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
@@ -48,8 +48,8 @@ class BlimpPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
-      const base::Callback<void(permissions::mojom::PermissionStatus)>&
-          callback) override;
+      const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+      override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
@@ -100,6 +100,7 @@ include_rules = [
   "+third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h",
   "+third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h",
   "+third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h",
+  "+third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h",
   "+third_party/WebKit/public/web/WebCache.h",
   "+third_party/WebKit/public/web/WebContextMenuData.h",
   "+third_party/WebKit/public/web/WebFindOptions.h",

diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
@@ -27,7 +27,6 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
-#include "components/permissions/permission_status.mojom.h"
 #include "components/user_manager/user.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -39,6 +38,7 @@
 #include "content/public/common/url_constants.h"
 #include "net/cert/pem_tokenizer.h"
 #include "net/cert/x509_certificate.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 
 namespace {
 
@@ -112,14 +112,14 @@ class DefaultDelegate : public PlatformVerificationFlow::Delegate {
     const GURL& requesting_origin = GetURL(web_contents).GetOrigin();
 
     GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
-    permissions::mojom::PermissionStatus status =
+    blink::mojom::PermissionStatus status =
         PermissionManager::Get(
             Profile::FromBrowserContext(web_contents->GetBrowserContext()))
             ->GetPermissionStatus(
                 content::PermissionType::PROTECTED_MEDIA_IDENTIFIER,
                 requesting_origin, embedding_origin);
 
-    return status == permissions::mojom::PermissionStatus::GRANTED;
+    return status == blink::mojom::PermissionStatus::GRANTED;
   }
 
   bool IsInSupportedMode(content::WebContents* web_contents) override {

diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
@@ -24,8 +24,8 @@ namespace extensions {
 namespace {
 
 void CallbackWrapper(const base::Callback<void(bool)>& callback,
-                     permissions::mojom::PermissionStatus status) {
-  callback.Run(status == permissions::mojom::PermissionStatus::GRANTED);
+                     blink::mojom::PermissionStatus status) {
+  callback.Run(status == blink::mojom::PermissionStatus::GRANTED);
 }
 
 }  // anonymous namespace
@@ -197,15 +197,15 @@ void ChromeWebViewPermissionHelperDelegate::RequestGeolocationPermission(
 
 void ChromeWebViewPermissionHelperDelegate::OnGeolocationPermissionResponse(
     int bridge_id,
-    const base::Callback<void(permissions::mojom::PermissionStatus)>& callback,
+    const base::Callback<void(blink::mojom::PermissionStatus)>& callback,
     bool allow,
     const std::string& user_input) {
   // The <webview> embedder has allowed the permission. We now need to make sure
   // that the embedder has geolocation permission.
   RemoveBridgeID(bridge_id);
 
   if (!allow || !web_view_guest()->attached()) {
-    callback.Run(permissions::mojom::PermissionStatus::DENIED);
+    callback.Run(blink::mojom::PermissionStatus::DENIED);
     return;
   }
 

diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_PERMISSION_HELPER_DELEGATE_H_
 
 #include "base/macros.h"
-#include "components/permissions/permission_status.mojom.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_helper_delegate.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 
 namespace extensions {
 class WebViewGuest;
@@ -76,8 +76,7 @@ class ChromeWebViewPermissionHelperDelegate :
 
   void OnGeolocationPermissionResponse(
       int bridge_id,
-      const base::Callback<void(permissions::mojom::PermissionStatus)>&
-          callback,
+      const base::Callback<void(blink::mojom::PermissionStatus)>& callback,
       bool allow,
       const std::string& user_input);
 

diff --git a/chrome/browser/notifications/notification_permission_context_unittest.cc b/chrome/browser/notifications/notification_permission_context_unittest.cc
@@ -17,18 +17,18 @@
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "components/permissions/permission_status.mojom.h"
 #include "content/public/browser/permission_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 #include "url/gurl.h"
 
 namespace {
 
 void DoNothing(ContentSetting content_setting) {}
-void DoNothing2(permissions::mojom::PermissionStatus status) {}
+void DoNothing2(blink::mojom::PermissionStatus status) {}
 
 class TestNotificationPermissionContext : public NotificationPermissionContext {
  public:

diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -178,13 +178,13 @@ void PlatformNotificationServiceImpl::OnPersistentNotificationClick(
     const GURL& origin,
     int action_index) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  permissions::mojom::PermissionStatus permission_status =
+  blink::mojom::PermissionStatus permission_status =
       CheckPermissionOnUIThread(browser_context, origin,
                                 kInvalidRenderProcessId);
 
   // TODO(peter): Change this to a CHECK() when Issue 555572 is resolved.
   // Also change this method to be const again.
-  if (permission_status != permissions::mojom::PermissionStatus::GRANTED) {
+  if (permission_status != blink::mojom::PermissionStatus::GRANTED) {
     content::RecordAction(base::UserMetricsAction(
         "Notifications.Persistent.ClickedWithoutPermission"));
     return;
@@ -228,7 +228,7 @@ void PlatformNotificationServiceImpl::OnPersistentNotificationClose(
           base::Bind(&OnCloseEventDispatchComplete));
 }
 
-permissions::mojom::PermissionStatus
+blink::mojom::PermissionStatus
 PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
     BrowserContext* browser_context,
     const GURL& origin,
@@ -262,7 +262,7 @@ PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
 
       NotifierId notifier_id(NotifierId::APPLICATION, extension->id());
       if (notifier_state_tracker->IsNotifierEnabled(notifier_id))
-        return permissions::mojom::PermissionStatus::GRANTED;
+        return blink::mojom::PermissionStatus::GRANTED;
     }
   }
 #endif
@@ -271,14 +271,14 @@ PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
       DesktopNotificationProfileUtil::GetContentSetting(profile, origin);
 
   if (setting == CONTENT_SETTING_ALLOW)
-    return permissions::mojom::PermissionStatus::GRANTED;
+    return blink::mojom::PermissionStatus::GRANTED;
   if (setting == CONTENT_SETTING_BLOCK)
-    return permissions::mojom::PermissionStatus::DENIED;
+    return blink::mojom::PermissionStatus::DENIED;
 
-  return permissions::mojom::PermissionStatus::ASK;
+  return blink::mojom::PermissionStatus::ASK;
 }
 
-permissions::mojom::PermissionStatus
+blink::mojom::PermissionStatus
 PlatformNotificationServiceImpl::CheckPermissionOnIOThread(
     content::ResourceContext* resource_context,
     const GURL& origin,
@@ -303,7 +303,7 @@ PlatformNotificationServiceImpl::CheckPermissionOnIOThread(
             extensions::APIPermission::kNotifications) &&
         process_map.Contains(extension->id(), render_process_id)) {
       if (!extension_info_map->AreNotificationsDisabled(extension->id()))
-        return permissions::mojom::PermissionStatus::GRANTED;
+        return blink::mojom::PermissionStatus::GRANTED;
     }
   }
 #endif
@@ -318,11 +318,11 @@ PlatformNotificationServiceImpl::CheckPermissionOnIOThread(
       content_settings::ResourceIdentifier());
 
   if (setting == CONTENT_SETTING_ALLOW)
-    return permissions::mojom::PermissionStatus::GRANTED;
+    return blink::mojom::PermissionStatus::GRANTED;
   if (setting == CONTENT_SETTING_BLOCK)
-    return permissions::mojom::PermissionStatus::DENIED;
+    return blink::mojom::PermissionStatus::DENIED;
 
-  return permissions::mojom::PermissionStatus::ASK;
+  return blink::mojom::PermissionStatus::ASK;
 }
 
 void PlatformNotificationServiceImpl::DisplayNotification(

diff --git a/chrome/browser/notifications/platform_notification_service_impl.h b/chrome/browser/notifications/platform_notification_service_impl.h
@@ -19,9 +19,9 @@
 #include "base/strings/string16.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/permissions/permission_status.mojom.h"
 #include "content/public/browser/platform_notification_service.h"
 #include "content/public/common/persistent_notification_status.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 
 class NotificationDelegate;
 class NotificationDisplayService;
@@ -84,11 +84,11 @@ class PlatformNotificationServiceImpl
   void OpenNotificationSettings(content::BrowserContext* browser_context);
 
   // content::PlatformNotificationService implementation.
-  permissions::mojom::PermissionStatus CheckPermissionOnUIThread(
+  blink::mojom::PermissionStatus CheckPermissionOnUIThread(
       content::BrowserContext* browser_context,
       const GURL& origin,
       int render_process_id) override;
-  permissions::mojom::PermissionStatus CheckPermissionOnIOThread(
+  blink::mojom::PermissionStatus CheckPermissionOnIOThread(
       content::ResourceContext* resource_context,
       const GURL& origin,
       int render_process_id) override;