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

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 4fcba4dca3d6d070c7849d593b353a8fedffe580..185f239df8eb840bb31c88a26bac2c8b22f6f77a 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -136,7 +136,6 @@ class NavigationState;
 class NotificationPermissionDispatcher;
 class PageState;
 class PepperPluginInstanceImpl;
-class PermissionDispatcher;
 class PresentationDispatcher;
 class PushMessagingDispatcher;
 class RenderAccessibilityImpl;
@@ -624,7 +623,6 @@ class CONTENT_EXPORT RenderFrameImpl
   void didChangeManifest() override;
   void enterFullscreen() override;
   void exitFullscreen() override;
-  blink::WebPermissionClient* permissionClient() override;
   blink::WebAppBannerClient* appBannerClient() override;
   void registerProtocolHandler(const blink::WebString& scheme,
                                const blink::WebURL& url,
@@ -1232,8 +1230,6 @@ class CONTENT_EXPORT RenderFrameImpl
   // AccessibilityModeOff.
   RenderAccessibilityImpl* render_accessibility_;
 
-  std::unique_ptr<PermissionDispatcher> permission_client_;
-
   std::unique_ptr<blink::WebAppBannerClient> app_banner_client_;
 
   std::unique_ptr<blink::WebBluetooth> bluetooth_;