Replace ContentSecurityPolicy::client() with a method returning an ExecutionContext

Source/core/dom/MainThreadTaskRunnerTest.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2013 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #include "config.h"
 #include "core/dom/MainThreadTaskRunner.h"
 
 #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;
 
 namespace {
 
 class NullEventQueue : public EventQueue {
 public:
     NullEventQueue() { }
     virtual ~NullEventQueue() { }
     virtual bool enqueueEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE { return true; }
     virtual bool cancelEvent(Event*) OVERRIDE { return true; }
     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();
 
     virtual EventQueue* eventQueue() const OVERRIDE { return m_queue.get(); }
     virtual bool tasksNeedSuspension() { return m_tasksNeedSuspension; }
 
     void setTasksNeedSuspention(bool flag) { m_tasksNeedSuspension = flag; }
 
     void trace(Visitor* visitor)
     {
         visitor->trace(m_queue);
         ExecutionContext::trace(visitor);
     }
 
 #if !ENABLE(OILPAN)
     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()
     : m_tasksNeedSuspension(false)
     , m_queue(adoptPtrWillBeNoop(new NullEventQueue()))
 {
 }
 
 class MarkingBooleanTask FINAL : public ExecutionContextTask {
 public:
@@ skipping 53 matching lines @@
     bool isMarked = false;
 
     context->setTasksNeedSuspention(true);
     runner->postTask(MarkingBooleanTask::create(&isMarked));
     runner.clear();
     WebCore::testing::runPendingTasks();
     EXPECT_FALSE(isMarked);
 }
 
 }