Rename blink::WebWorkerPermissionProxyClient to blink::WebWorkerContentSettingsProxyClient.

This is part of a suite of thee CLs:
1. https://codereview.chromium.org/968163003
2. <this>
3. https://codereview.chromium.org/968203002

BUG=462255

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

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

chrome/chrome_renderer.gypi

@@ -68,8 +68,8 @@
       'renderer/web_apps.h',
       'renderer/webview_color_overlay.cc',
       'renderer/webview_color_overlay.h',
-      'renderer/worker_permission_client_proxy.cc',
-      'renderer/worker_permission_client_proxy.h',
+      'renderer/worker_content_settings_client_proxy.cc',
+      'renderer/worker_content_settings_client_proxy.h',
     ],
     'chrome_renderer_webrtc_sources': [
       'renderer/media/chrome_webrtc_log_message_delegate.cc',

chrome/renderer/chrome_content_renderer_client.cc

@@ -55,7 +55,7 @@
 #include "chrome/renderer/searchbox/searchbox.h"
 #include "chrome/renderer/searchbox/searchbox_extension.h"
 #include "chrome/renderer/tts_dispatcher.h"
-#include "chrome/renderer/worker_permission_client_proxy.h"
+#include "chrome/renderer/worker_content_settings_client_proxy.h"
 #include "components/autofill/content/renderer/autofill_agent.h"
 #include "components/autofill/content/renderer/password_autofill_agent.h"
 #include "components/autofill/content/renderer/password_generation_agent.h"
@@ -1596,11 +1596,11 @@ bool ChromeContentRendererClient::ShouldEnableSiteIsolationPolicy() const {
 #endif
 }
 
-blink::WebWorkerPermissionClientProxy*
-ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
+blink::WebWorkerContentSettingsClientProxy*
+ChromeContentRendererClient::CreateWorkerContentSettingsClientProxy(
     content::RenderFrame* render_frame,
     blink::WebFrame* frame) {
-  return new WorkerPermissionClientProxy(render_frame, frame);
+  return new WorkerContentSettingsClientProxy(render_frame, frame);
 }
 
 bool ChromeContentRendererClient::IsPluginAllowedToUseDevChannelAPIs() {

chrome/renderer/chrome_content_renderer_client.h

@@ -139,9 +139,9 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   bool ShouldReportDetailedMessageForSource(
       const base::string16& source) const override;
   bool ShouldEnableSiteIsolationPolicy() const override;
-  blink::WebWorkerPermissionClientProxy* CreateWorkerPermissionClientProxy(
-      content::RenderFrame* render_frame,
-      blink::WebFrame* frame) override;
+  blink::WebWorkerContentSettingsClientProxy*
+  CreateWorkerContentSettingsClientProxy(content::RenderFrame* render_frame,
+                                         blink::WebFrame* frame) override;
   bool AllowPepperMediaStreamAPI(const GURL& url) override;
   void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
   bool IsPluginAllowedToUseDevChannelAPIs() override;

chrome/renderer/worker_permission_client_proxy.cc → chrome/renderer/worker_content_settings_client_proxy.cc

@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/renderer/worker_content_settings_client_proxy.h"
+
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/worker_permission_client_proxy.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "ipc/ipc_sync_message_filter.h"
@@ -12,7 +13,7 @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 
-WorkerPermissionClientProxy::WorkerPermissionClientProxy(
+WorkerContentSettingsClientProxy::WorkerContentSettingsClientProxy(
     content::RenderFrame* render_frame,
     blink::WebFrame* frame)
     : routing_id_(render_frame->GetRoutingID()),
@@ -26,9 +27,9 @@ WorkerPermissionClientProxy::WorkerPermissionClientProxy(
       frame->top()->document().securityOrigin().toString());
 }
 
-WorkerPermissionClientProxy::~WorkerPermissionClientProxy() {}
+WorkerContentSettingsClientProxy::~WorkerContentSettingsClientProxy() {}
 
-bool WorkerPermissionClientProxy::allowDatabase(
+bool WorkerContentSettingsClientProxy::allowDatabase(
     const blink::WebString& name,
     const blink::WebString& display_name,
     unsigned long estimated_size) {
@@ -42,7 +43,7 @@ bool WorkerPermissionClientProxy::allowDatabase(
   return result;
 }
 
-bool WorkerPermissionClientProxy::requestFileSystemAccessSync() {
+bool WorkerContentSettingsClientProxy::requestFileSystemAccessSync() {
   if (is_unique_origin_)
     return false;
 
@@ -52,7 +53,7 @@ bool WorkerPermissionClientProxy::requestFileSystemAccessSync() {
   return result;
 }
 
-bool WorkerPermissionClientProxy::allowIndexedDB(
+bool WorkerContentSettingsClientProxy::allowIndexedDB(
     const blink::WebString& name) {
   if (is_unique_origin_)
     return false;

chrome/renderer/worker_permission_client_proxy.h → chrome/renderer/worker_content_settings_client_proxy.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_WORKER_PERMISSION_CLIENT_PROXY_H_
-#define CHROME_RENDERER_WORKER_PERMISSION_CLIENT_PROXY_H_
+#ifndef CHROME_RENDERER_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_
+#define CHROME_RENDERER_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "third_party/WebKit/public/web/WebWorkerPermissionClientProxy.h"
+#include "third_party/WebKit/public/web/WebWorkerContentSettingsClientProxy.h"
 #include "url/gurl.h"
 
 namespace IPC {
@@ -24,14 +24,14 @@ class WebFrame;
 
 // This proxy is created on the main renderer thread then passed onto
 // the blink's worker thread.
-class WorkerPermissionClientProxy
-    : public blink::WebWorkerPermissionClientProxy {
+class WorkerContentSettingsClientProxy
+    : public blink::WebWorkerContentSettingsClientProxy {
  public:
-  WorkerPermissionClientProxy(content::RenderFrame* render_frame,
+  WorkerContentSettingsClientProxy(content::RenderFrame* render_frame,
                               blink::WebFrame* frame);
-  virtual ~WorkerPermissionClientProxy();
+  virtual ~WorkerContentSettingsClientProxy();
 
-  // WebWorkerPermissionClientProxy overrides.
+  // WebWorkerContentSettingsClientProxy overrides.
   virtual bool allowDatabase(const blink::WebString& name,
                              const blink::WebString& display_name,
                              unsigned long estimated_size);
@@ -46,7 +46,7 @@ class WorkerPermissionClientProxy
   GURL top_frame_origin_url_;
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
 
-  DISALLOW_COPY_AND_ASSIGN(WorkerPermissionClientProxy);
+  DISALLOW_COPY_AND_ASSIGN(WorkerContentSettingsClientProxy);
 };
 
-#endif  // CHROME_RENDERER_WORKER_PERMISSION_CLIENT_PROXY_H_
+#endif  // CHROME_RENDERER_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_

content/content_renderer.gypi

@@ -403,8 +403,8 @@
       'renderer/service_worker/service_worker_type_util.h',
       'renderer/shared_memory_seqlock_reader.cc',
       'renderer/shared_memory_seqlock_reader.h',
-      'renderer/shared_worker/embedded_shared_worker_permission_client_proxy.cc',
-      'renderer/shared_worker/embedded_shared_worker_permission_client_proxy.h',
+      'renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.cc',
+      'renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h',
       'renderer/shared_worker/embedded_shared_worker_stub.cc',
       'renderer/shared_worker/embedded_shared_worker_stub.h',
       'renderer/shared_worker_repository.cc',

content/public/renderer/content_renderer_client.cc

@@ -190,8 +190,8 @@ bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const {
   return true;
 }
 
-blink::WebWorkerPermissionClientProxy*
-ContentRendererClient::CreateWorkerPermissionClientProxy(
+blink::WebWorkerContentSettingsClientProxy*
+ContentRendererClient::CreateWorkerContentSettingsClientProxy(
     RenderFrame* render_frame, blink::WebFrame* frame) {
   return nullptr;
 }

content/public/renderer/content_renderer_client.h

@@ -47,7 +47,7 @@ class WebSpeechSynthesizer;
 class WebSpeechSynthesizerClient;
 class WebThemeEngine;
 class WebURLRequest;
-class WebWorkerPermissionClientProxy;
+class WebWorkerContentSettingsClientProxy;
 struct WebPluginParams;
 struct WebURLError;
 }
@@ -281,9 +281,9 @@ class CONTENT_EXPORT ContentRendererClient {
   virtual bool ShouldEnableSiteIsolationPolicy() const;
 
   // Creates a permission client proxy for in-renderer worker.
-  virtual blink::WebWorkerPermissionClientProxy*
-      CreateWorkerPermissionClientProxy(RenderFrame* render_frame,
-                                        blink::WebFrame* frame);
+  virtual blink::WebWorkerContentSettingsClientProxy*
+      CreateWorkerContentSettingsClientProxy(RenderFrame* render_frame,
+                                             blink::WebFrame* frame);
 
   // Returns true if the page at |url| can use Pepper CameraDevice APIs.
   virtual bool IsPluginAllowedToUseCameraDeviceAPI(const GURL& url);

content/renderer/render_frame_impl.cc

@@ -1953,13 +1953,13 @@ blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
       RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
 }
 
-blink::WebWorkerPermissionClientProxy*
-RenderFrameImpl::createWorkerPermissionClientProxy(
+blink::WebWorkerContentSettingsClientProxy*
+RenderFrameImpl::createWorkerContentSettingsClientProxy(
     blink::WebLocalFrame* frame) {
   if (!frame || !frame->view())
     return NULL;
   DCHECK(!frame_ || frame_ == frame);
-  return GetContentClient()->renderer()->CreateWorkerPermissionClientProxy(
+  return GetContentClient()->renderer()->CreateWorkerContentSettingsClientProxy(
       this, frame);
 }
 

content/renderer/render_frame_impl.h

@@ -348,8 +348,8 @@ class CONTENT_EXPORT RenderFrameImpl
   virtual blink::WebApplicationCacheHost* createApplicationCacheHost(
       blink::WebLocalFrame* frame,
       blink::WebApplicationCacheHostClient* client);
-  virtual blink::WebWorkerPermissionClientProxy*
-      createWorkerPermissionClientProxy(blink::WebLocalFrame* frame);
+  virtual blink::WebWorkerContentSettingsClientProxy*
+      createWorkerContentSettingsClientProxy(blink::WebLocalFrame* frame);
   virtual blink::WebExternalPopupMenu* createExternalPopupMenu(
       const blink::WebPopupMenuInfo& popup_menu_info,
       blink::WebExternalPopupMenuClient* popup_menu_client);

content/renderer/shared_worker/embedded_shared_worker_permission_client_proxy.cc → content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.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 "content/renderer/shared_worker/embedded_shared_worker_permission_client_proxy.h"
+#include "content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h"
 
 #include "content/child/thread_safe_sender.h"
 #include "content/common/worker_messages.h"
@@ -11,8 +11,8 @@
 
 namespace content {
 
-EmbeddedSharedWorkerPermissionClientProxy::
-    EmbeddedSharedWorkerPermissionClientProxy(
+EmbeddedSharedWorkerContentSettingsClientProxy::
+    EmbeddedSharedWorkerContentSettingsClientProxy(
         const GURL& origin_url,
         bool is_unique_origin,
         int routing_id,
@@ -23,11 +23,11 @@ EmbeddedSharedWorkerPermissionClientProxy::
       thread_safe_sender_(thread_safe_sender) {
 }
 
-EmbeddedSharedWorkerPermissionClientProxy::
-    ~EmbeddedSharedWorkerPermissionClientProxy() {
+EmbeddedSharedWorkerContentSettingsClientProxy::
+    ~EmbeddedSharedWorkerContentSettingsClientProxy() {
 }
 
-bool EmbeddedSharedWorkerPermissionClientProxy::allowDatabase(
+bool EmbeddedSharedWorkerContentSettingsClientProxy::allowDatabase(
     const blink::WebString& name,
     const blink::WebString& display_name,
     unsigned long estimated_size) {
@@ -39,7 +39,8 @@ bool EmbeddedSharedWorkerPermissionClientProxy::allowDatabase(
   return result;
 }
 
-bool EmbeddedSharedWorkerPermissionClientProxy::requestFileSystemAccessSync() {
+bool
+EmbeddedSharedWorkerContentSettingsClientProxy::requestFileSystemAccessSync() {
   if (is_unique_origin_)
     return false;
   bool result = false;
@@ -49,7 +50,7 @@ bool EmbeddedSharedWorkerPermissionClientProxy::requestFileSystemAccessSync() {
   return result;
 }
 
-bool EmbeddedSharedWorkerPermissionClientProxy::allowIndexedDB(
+bool EmbeddedSharedWorkerContentSettingsClientProxy::allowIndexedDB(
     const blink::WebString& name) {
   if (is_unique_origin_)
     return false;

content/renderer/shared_worker/embedded_shared_worker_permission_client_proxy.h → content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_PERMISSION_CLIENT_PROXY_H_
-#define CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_PERMISSION_CLIENT_PROXY_H_
+#ifndef CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_
+#define CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "third_party/WebKit/public/web/WebWorkerPermissionClientProxy.h"
+#include "third_party/WebKit/public/web/WebWorkerContentSettingsClientProxy.h"
 #include "url/gurl.h"
 
 namespace content {
@@ -16,17 +16,17 @@ class ThreadSafeSender;
 
 // This proxy is created on the main renderer thread then passed onto
 // the blink's worker thread.
-class EmbeddedSharedWorkerPermissionClientProxy
-    : public blink::WebWorkerPermissionClientProxy {
+class EmbeddedSharedWorkerContentSettingsClientProxy
+    : public blink::WebWorkerContentSettingsClientProxy {
  public:
-  EmbeddedSharedWorkerPermissionClientProxy(
+  EmbeddedSharedWorkerContentSettingsClientProxy(
       const GURL& origin_url,
       bool is_unique_origin,
       int routing_id,
       ThreadSafeSender* thread_safe_sender);
-  virtual ~EmbeddedSharedWorkerPermissionClientProxy();
+  virtual ~EmbeddedSharedWorkerContentSettingsClientProxy();
 
-  // WebWorkerPermissionClientProxy overrides.
+  // WebWorkerContentSettingsClientProxy overrides.
   virtual bool allowDatabase(const blink::WebString& name,
                              const blink::WebString& display_name,
                              unsigned long estimated_size);
@@ -39,9 +39,9 @@ class EmbeddedSharedWorkerPermissionClientProxy
   const int routing_id_;
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
-  DISALLOW_COPY_AND_ASSIGN(EmbeddedSharedWorkerPermissionClientProxy);
+  DISALLOW_COPY_AND_ASSIGN(EmbeddedSharedWorkerContentSettingsClientProxy);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_PERMISSION_CLIENT_PROXY_H_
+#endif  // CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_

content/renderer/shared_worker/embedded_shared_worker_stub.cc

@@ -16,7 +16,7 @@
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "content/renderer/render_thread_impl.h"
-#include "content/renderer/shared_worker/embedded_shared_worker_permission_client_proxy.h"
+#include "content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
@@ -220,10 +220,10 @@ EmbeddedSharedWorkerStub::createApplicationCacheHost(
   return app_cache_host_;
 }
 
-blink::WebWorkerPermissionClientProxy*
-    EmbeddedSharedWorkerStub::createWorkerPermissionClientProxy(
+blink::WebWorkerContentSettingsClientProxy*
+    EmbeddedSharedWorkerStub::createWorkerContentSettingsClientProxy(
     const blink::WebSecurityOrigin& origin) {
-  return new EmbeddedSharedWorkerPermissionClientProxy(
+  return new EmbeddedSharedWorkerContentSettingsClientProxy(
       GURL(origin.toString()),
       origin.isUnique(),
       route_id_,

content/renderer/shared_worker/embedded_shared_worker_stub.h

@@ -22,7 +22,7 @@ class WebMessagePortChannel;
 class WebNotificationPresenter;
 class WebSecurityOrigin;
 class WebSharedWorker;
-class WebWorkerPermissionClientProxy;
+class WebWorkerContentSettingsClientProxy;
 }
 
 namespace content {
@@ -55,8 +55,8 @@ class EmbeddedSharedWorkerStub : public IPC::Listener,
   virtual blink::WebNotificationPresenter* notificationPresenter() override;
   virtual blink::WebApplicationCacheHost* createApplicationCacheHost(
       blink::WebApplicationCacheHostClient*) override;
-  virtual blink::WebWorkerPermissionClientProxy*
-      createWorkerPermissionClientProxy(
+  virtual blink::WebWorkerContentSettingsClientProxy*
+      createWorkerContentSettingsClientProxy(
           const blink::WebSecurityOrigin& origin) override;
   virtual blink::WebServiceWorkerNetworkProvider*
       createServiceWorkerNetworkProvider(blink::WebDataSource*) override;