1 files changed, 11 insertions, 6 deletions
diff --git a/chromium/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.h b/chromium/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.h
index 1555111e9f3..d31a367d6cb 100644
--- a/chromium/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.h
+++ b/chromium/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.h
@@ -32,21 +32,24 @@
 #define DedicatedWorkerGlobalScope_h
 
 #include "core/dom/MessagePort.h"
-#include "core/frame/ContentSecurityPolicy.h"
+#include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/workers/WorkerGlobalScope.h"
+#include "platform/heap/Handle.h"
 
 namespace WebCore {
 
 class DedicatedWorkerThread;
-struct WorkerThreadStartupData;
+class WorkerThreadStartupData;
 
-class DedicatedWorkerGlobalScope : public WorkerGlobalScope {
+class DedicatedWorkerGlobalScope FINAL : public WorkerGlobalScope {
 public:
     typedef WorkerGlobalScope Base;
-    static PassRefPtr<DedicatedWorkerGlobalScope> create(DedicatedWorkerThread*, PassOwnPtr<WorkerThreadStartupData>, double timeOrigin);
+    static PassRefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> create(DedicatedWorkerThread*, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>, double timeOrigin);
     virtual ~DedicatedWorkerGlobalScope();
 
     virtual bool isDedicatedWorkerGlobalScope() const OVERRIDE { return true; }
+    virtual void countFeature(UseCounter::Feature) const OVERRIDE;
+    virtual void countDeprecation(UseCounter::Feature) const OVERRIDE;
 
     // Overridden to allow us to check our pending activity after executing imported script.
     virtual void importScripts(const Vector<String>& urls, ExceptionState&) OVERRIDE;
@@ -58,10 +61,12 @@ public:
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
 
-    DedicatedWorkerThread* thread();
+    DedicatedWorkerThread* thread() const;
+
+    virtual void trace(Visitor*) OVERRIDE;
 
 private:
-    DedicatedWorkerGlobalScope(const KURL&, const String& userAgent, DedicatedWorkerThread*, double timeOrigin, PassOwnPtr<WorkerClients>);
+    DedicatedWorkerGlobalScope(const KURL&, const String& userAgent, DedicatedWorkerThread*, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>);
 };
 
 } // namespace WebCore