blink: Remove uses of blink variant bindings in content

Including a blink variant binding in content/renderer means that
content/renderer includes all of wtf/. Sadly this means that we can
no longer use the same enum in content/renderer and blink so we
static cast at the boundary.

Review-Url: https://codereview.chromium.org/2145993003
Cr-Commit-Position: refs/heads/master@{#405498}

content/renderer/BUILD.gn

@@ -76,7 +76,6 @@ source_set("renderer") {
     "//storage/common",
     "//third_party/WebKit/public:blink",
     "//third_party/WebKit/public:mojo_bindings",
-    "//third_party/WebKit/public:mojo_bindings_blink",
     "//third_party/boringssl",
     "//third_party/icu",
     "//third_party/libjingle",

content/renderer/notification_permission_dispatcher.cc

@@ -11,7 +11,6 @@
 #include "services/shell/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom-blink.h"
 #include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "third_party/WebKit/public/web/modules/notifications/WebNotificationPermissionCallback.h"
@@ -50,8 +49,8 @@ void NotificationPermissionDispatcher::OnPermissionRequestComplete(
     blink::mojom::PermissionStatus status) {
   DCHECK(callback);
 
-  blink::mojom::blink::PermissionStatus blink_status =
-      static_cast<blink::mojom::blink::PermissionStatus>(status);
+  // Blink can't use non-blink bindings so we need to cast to int32.
+  int32_t blink_status = static_cast<int32_t>(status);
 
   callback->permissionRequestComplete(blink_status);
 }

third_party/WebKit/Source/web/NotificationPermissionClientImpl.cpp

@@ -28,9 +28,9 @@ public:
 
     ~WebNotificationPermissionCallbackImpl() override { }
 
-    void permissionRequestComplete(mojom::blink::PermissionStatus permissionStatus) override
+    void permissionRequestComplete(int32_t permissionStatus) override
     {
-        String permissionString = Notification::permissionString(permissionStatus);
+        String permissionString = Notification::permissionString(static_cast<mojom::blink::PermissionStatus>(permissionStatus));
         if (m_deprecatedCallback)
             m_deprecatedCallback->handleEvent(permissionString);
 

third_party/WebKit/public/web/modules/notifications/WebNotificationPermissionCallback.h

@@ -31,8 +31,6 @@
 #ifndef WebNotificationPermissionCallback_h
 #define WebNotificationPermissionCallback_h
 
-#include "public/platform/modules/permissions/permission_status.mojom-blink.h"
-
 namespace blink {
 
 // Callback object used for Web Notification permission requests.
@@ -42,7 +40,7 @@ public:
 
     // Method to be invoked when the asynchronous permission request for the
     // ability to display Web Notifications has been completed.
-    virtual void permissionRequestComplete(mojom::blink::PermissionStatus) = 0;
+    virtual void permissionRequestComplete(int32_t permissionStatus) = 0;
 };
 
 } // namespace blink