Revert of Rename WorkerPermissionClient and friends to WorkerContentSettingsClient.

public/web/WebSharedWorkerClient.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebSharedWorkerClient_h
 #define WebSharedWorkerClient_h
 
-#include "public/platform/WebMessagePortChannel.h"
-#include "public/web/WebWorkerPermissionClientProxy.h"
+#include "../platform/WebMessagePortChannel.h"
 
 namespace blink {
 
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebDataSource;
 class WebNotificationPresenter;
 class WebSecurityOrigin;
 class WebServiceWorkerNetworkProvider;
 class WebString;
 class WebWorker;
-class WebWorkerContentSettingsClientProxy;
+class WebWorkerPermissionClientProxy;
 
 // Provides an interface back to the in-page script object for a worker.
 // All functions are expected to be called back on the thread that created
 // the Worker object, unless noted.
 class WebSharedWorkerClient {
 public:
     virtual void workerContextClosed() = 0;
     virtual void workerContextDestroyed() = 0;
     virtual void workerReadyForInspection() { }
     virtual void workerScriptLoaded() = 0;
     virtual void workerScriptLoadFailed() = 0;
     virtual void selectAppCacheID(long long) = 0;
 
     // Returns the notification presenter for this worker context. Pointer
     // is owned by the object implementing WebSharedWorkerClient.
     virtual WebNotificationPresenter* notificationPresenter() = 0;
 
     // Called on the main webkit thread in the worker process during
     // initialization.
     virtual WebApplicationCacheHost* createApplicationCacheHost(WebApplicationCacheHostClient*) = 0;
 
     // Called on the main thread during initialization.
-    // WebWorkerContentSettingsClientProxy should not retain the given
+    // WebWorkerPermissionClientProxy should not retain the given
     // WebSecurityOrigin, as the proxy instance is passed to worker thread
     // while WebSecurityOrigin is not thread safe.
-    virtual WebWorkerContentSettingsClientProxy* createWorkerContentSettingsClientProxy(const WebSecurityOrigin& origin)
-    {
-        return createWorkerPermissionClientProxy(origin);
-    }
-    // Deprecated call required by embedder.
     virtual WebWorkerPermissionClientProxy* createWorkerPermissionClientProxy(const WebSecurityOrigin&) { return nullptr; }
 
     // Called on the main thread during initialization.
     // Ownership of the returned object is transferred to the caller.
     virtual WebServiceWorkerNetworkProvider* createServiceWorkerNetworkProvider(WebDataSource*) { return nullptr; }
 
     virtual void sendDevToolsMessage(int callId, const WebString& message, const WebString& state) { }
 };
 
 } // namespace blink
 
 #endif