Merge ExecutionContextClient and ExecutionContext

Source/core/workers/WorkerGlobalScope.h

Index: Source/core/workers/WorkerGlobalScope.h
diff --git a/Source/core/workers/WorkerGlobalScope.h b/Source/core/workers/WorkerGlobalScope.h
index 5572a45873aaa9698d8e6e03fb867f247da9e385..ff8dc34fd030187ad81f79a360df83a193da901c 100644
--- a/Source/core/workers/WorkerGlobalScope.h
+++ b/Source/core/workers/WorkerGlobalScope.h
@@ -59,7 +59,7 @@ class WorkerLocation;
 class WorkerNavigator;
 class WorkerThread;
 
-class WorkerGlobalScope : public RefCountedWillBeGarbageCollectedFinalized<WorkerGlobalScope>, public SecurityContext, public ExecutionContext, public ExecutionContextClient, public WillBeHeapSupplementable<WorkerGlobalScope>, public EventTargetWithInlineData, public DOMWindowBase64 {
+class WorkerGlobalScope : public RefCountedWillBeGarbageCollectedFinalized<WorkerGlobalScope>, public SecurityContext, public ExecutionContext, public WillBeHeapSupplementable<WorkerGlobalScope>, public EventTargetWithInlineData, public DOMWindowBase64 {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_EVENT_TARGET(WorkerGlobalScope);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
@@ -67,9 +67,6 @@ public:
     virtual ~WorkerGlobalScope();
 
     virtual bool isWorkerGlobalScope() const OVERRIDE FINAL { return true; }
-    virtual bool isSharedWorkerGlobalScope() const OVERRIDE { return false; }
-    virtual bool isDedicatedWorkerGlobalScope() const OVERRIDE { return false; }
-    virtual bool isServiceWorkerGlobalScope() const OVERRIDE { return false; }
 
     virtual ExecutionContext* executionContext() const OVERRIDE FINAL;
 
@@ -138,7 +135,7 @@ public:
     using SecurityContext::securityOrigin;
     using SecurityContext::contentSecurityPolicy;
 
-    virtual void addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE FINAL;
+    virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE FINAL;
     ConsoleMessageStorage* messageStorage();
 
     virtual void trace(Visitor*) OVERRIDE;