Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Unified Diff: Source/core/dom/MainThreadTaskRunnerTest.cpp

Issue 332993002: Replace ContentSecurityPolicy::client() with a method returning an ExecutionContext (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/ExecutionContextClient.h ('k') | Source/core/frame/csp/CSPDirectiveList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/MainThreadTaskRunnerTest.cpp
diff --git a/Source/core/dom/MainThreadTaskRunnerTest.cpp b/Source/core/dom/MainThreadTaskRunnerTest.cpp
index 1d0b9a064784051e9a88c73edc923e5e904455bb..ee25ce82fecf6ccd1d14935c4563abc78f64e797 100644
--- a/Source/core/dom/MainThreadTaskRunnerTest.cpp
+++ b/Source/core/dom/MainThreadTaskRunnerTest.cpp
@@ -30,8 +30,10 @@
#include "core/dom/ExecutionContext.h"
#include "core/dom/ExecutionContextTask.h"
+#include "core/dom/SecurityContext.h"
#include "core/events/EventQueue.h"
#include "core/testing/UnitTestHelpers.h"
+#include "wtf/Forward.h"
#include <gtest/gtest.h>
using namespace WebCore;
@@ -47,7 +49,7 @@ public:
virtual void close() OVERRIDE { }
};
-class NullExecutionContext : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public ExecutionContext {
+class NullExecutionContext : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public SecurityContext, public ExecutionContext {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NullExecutionContext);
public:
NullExecutionContext();
@@ -67,13 +69,23 @@ public:
using RefCounted<NullExecutionContext>::ref;
using RefCounted<NullExecutionContext>::deref;
+ virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) OVERRIDE { }
+
+ virtual SecurityContext& securityContext() { return *this; }
+
virtual void refExecutionContext() OVERRIDE { ref(); }
virtual void derefExecutionContext() OVERRIDE { deref(); }
#endif
+protected:
+ virtual const KURL& virtualURL() const OVERRIDE { return m_dummyURL; }
+ virtual KURL virtualCompleteURL(const String&) const OVERRIDE { return m_dummyURL; }
+
private:
bool m_tasksNeedSuspension;
OwnPtrWillBeMember<EventQueue> m_queue;
+
+ KURL m_dummyURL;
};
NullExecutionContext::NullExecutionContext()
« no previous file with comments | « Source/core/dom/ExecutionContextClient.h ('k') | Source/core/frame/csp/CSPDirectiveList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698