Rename blink::WebPermissionClient to blink::WebContentSettings.

This is part of a series of three CLs:
1. https://codereview.chromium.org/962713002
2. <this>
3. https://codereview.chromium.org/962733002

BUG=462255

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

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

4 files changed, 46 insertions, 45 deletions

diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index c12cc7f..329e873 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -7,9 +7,9 @@
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/common/url_constants.h"
+#include "android_webview/renderer/aw_content_settings_client.h"
 #include "android_webview/renderer/aw_key_systems.h"
 #include "android_webview/renderer/aw_message_port_client.h"
-#include "android_webview/renderer/aw_permission_client.h"
 #include "android_webview/renderer/aw_print_web_view_helper_delegate.h"
 #include "android_webview/renderer/aw_render_frame_ext.h"
 #include "android_webview/renderer/aw_render_view_ext.h"
@@ -121,7 +121,7 @@ bool AwContentRendererClient::HandleNavigation(
 
 void AwContentRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
-  new AwPermissionClient(render_frame);
+  new AwContentSettingsClient(render_frame);
   new PrintRenderFrameObserver(render_frame);
   new AwRenderFrameExt(render_frame);
   new AwMessagePortClient(render_frame);
diff --git a/android_webview/renderer/aw_permission_client.cc b/android_webview/renderer/aw_content_settings_client.cc
index afe0d47..92652f6 100644
--- a/android_webview/renderer/aw_permission_client.cc
+++ b/android_webview/renderer/aw_content_settings_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/renderer/aw_permission_client.h"
+#include "android_webview/renderer/aw_content_settings_client.h"
 
 #include "content/public/renderer/render_frame.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ -24,22 +24,23 @@ bool AllowMixedContent(const blink::WebURL& url) {
 
 }
 
-AwPermissionClient::AwPermissionClient(content::RenderFrame* render_frame)
+AwContentSettingsClient::AwContentSettingsClient(
+    content::RenderFrame* render_frame)
     : content::RenderFrameObserver(render_frame) {
-  render_frame->GetWebFrame()->setPermissionClient(this);
+  render_frame->GetWebFrame()->setContentSettingsClient(this);
 }
 
-AwPermissionClient::~AwPermissionClient() {
+AwContentSettingsClient::~AwContentSettingsClient() {
 }
 
-bool AwPermissionClient::allowDisplayingInsecureContent(
+bool AwContentSettingsClient::allowDisplayingInsecureContent(
       bool enabled_per_settings,
       const blink::WebSecurityOrigin& origin,
       const blink::WebURL& url) {
   return enabled_per_settings ? true : AllowMixedContent(url);
 }
 
-bool AwPermissionClient::allowRunningInsecureContent(
+bool AwContentSettingsClient::allowRunningInsecureContent(
       bool enabled_per_settings,
       const blink::WebSecurityOrigin& origin,
       const blink::WebURL& url) {
diff --git a/android_webview/renderer/aw_content_settings_client.h b/android_webview/renderer/aw_content_settings_client.h
new file mode 100644
index 0000000..5d44551
--- /dev/null
+++ b/android_webview/renderer/aw_content_settings_client.h
@@ -0,0 +1,37 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_
+#define ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_
+
+#include "content/public/renderer/render_frame_observer.h"
+#include "third_party/WebKit/public/web/WebContentSettingsClient.h"
+
+namespace android_webview {
+
+// Android WebView implementation of blink::WebContentSettingsClient.
+class AwContentSettingsClient : public content::RenderFrameObserver,
+                                public blink::WebContentSettingsClient {
+ public:
+  explicit AwContentSettingsClient(content::RenderFrame* render_view);
+
+ private:
+  ~AwContentSettingsClient() override;
+
+  // blink::WebContentSettingsClient implementation.
+  virtual bool allowDisplayingInsecureContent(
+      bool enabled_per_settings,
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url);
+  virtual bool allowRunningInsecureContent(
+      bool enabled_per_settings,
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url);
+
+  DISALLOW_COPY_AND_ASSIGN(AwContentSettingsClient);
+};
+
+}  // namespace android_webview
+
+#endif  // ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_
diff --git a/android_webview/renderer/aw_permission_client.h b/android_webview/renderer/aw_permission_client.h
deleted file mode 100644
index e5c036d..0000000
--- a/android_webview/renderer/aw_permission_client.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ANDROID_WEBVIEW_RENDERER_AW_PERMISSION_CLIENT_H_
-#define ANDROID_WEBVIEW_RENDERER_AW_PERMISSION_CLIENT_H_
-
-#include "content/public/renderer/render_frame_observer.h"
-#include "third_party/WebKit/public/web/WebPermissionClient.h"
-
-namespace android_webview {
-
-// Android WebView implementation of blink::WebPermissionClient.
-class AwPermissionClient : public content::RenderFrameObserver,
-                           public blink::WebPermissionClient {
- public:
-  explicit AwPermissionClient(content::RenderFrame* render_view);
-
- private:
-  ~AwPermissionClient() override;
-
-  // blink::WebPermissionClient implementation.
-  virtual bool allowDisplayingInsecureContent(
-      bool enabled_per_settings,
-      const blink::WebSecurityOrigin& origin,
-      const blink::WebURL& url);
-  virtual bool allowRunningInsecureContent(
-      bool enabled_per_settings,
-      const blink::WebSecurityOrigin& origin,
-      const blink::WebURL& url);
-
-  DISALLOW_COPY_AND_ASSIGN(AwPermissionClient);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_RENDERER_AW_PERMISSION_CLIENT_H_