Merge //content/child/permissions into Blink's permissions module.

third_party/WebKit/public/web/WebFrameClient.h

Index: third_party/WebKit/public/web/WebFrameClient.h
diff --git a/third_party/WebKit/public/web/WebFrameClient.h b/third_party/WebKit/public/web/WebFrameClient.h
index 814d87c508fc29b792f96ff3b0b13971de339066..6f8e10afbf90f15e5f38f1b56fdcca319b556d30 100644
--- a/third_party/WebKit/public/web/WebFrameClient.h
+++ b/third_party/WebKit/public/web/WebFrameClient.h
@@ -91,7 +91,6 @@ class WebMediaSession;
 class WebMediaStream;
 class WebMIDIClient;
 class WebNotificationPermissionCallback;
-class WebPermissionClient;
 class WebServiceWorkerProvider;
 class WebSocketHandle;
 class WebPlugin;
@@ -670,11 +669,6 @@ public:
     virtual void suddenTerminationDisablerChanged(bool present, SuddenTerminationDisablerType) { }
 
 
-    // Permissions ---------------------------------------------------------
-
-    // Access the embedder API for permission client.
-    virtual WebPermissionClient* permissionClient() { return 0; }
-
     // App Banners ---------------------------------------------------------
     virtual WebAppBannerClient* appBannerClient() { return 0; }