Merge ExecutionContextClient and ExecutionContext

Source/core/testing/NullExecutionContext.h

Index: Source/core/testing/NullExecutionContext.h
diff --git a/Source/core/testing/NullExecutionContext.h b/Source/core/testing/NullExecutionContext.h
index eecf2725db494ad7cd746208664a76c47dbfd700..ec7246aebd45f400079ebff72f917d56ae69e5c6 100644
--- a/Source/core/testing/NullExecutionContext.h
+++ b/Source/core/testing/NullExecutionContext.h
@@ -19,20 +19,32 @@ class NullExecutionContext FINAL : public RefCountedWillBeGarbageCollectedFinali
 public:
     NullExecutionContext();
 
+    virtual void disableEval(const String&) OVERRIDE { }
+    virtual String userAgent(const KURL&) const OVERRIDE { return String(); }
+
+    virtual void postTask(PassOwnPtr<ExecutionContextTask>) OVERRIDE;
+
+    virtual EventTarget* errorEventTarget() OVERRIDE { return 0; }
     virtual EventQueue* eventQueue() const OVERRIDE { return m_queue.get(); }
 
     virtual bool tasksNeedSuspension() OVERRIDE { return m_tasksNeedSuspension; }
     void setTasksNeedSuspension(bool flag) { m_tasksNeedSuspension = flag; }
 
+    virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) OVERRIDE { }
+    virtual void didUpdateSecurityOrigin() OVERRIDE { }
+    virtual SecurityContext& securityContext() OVERRIDE { return *this; }
+
+    double timerAlignmentInterval() const;
+
+    virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE { }
+    virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) OVERRIDE { }
+
     void trace(Visitor* visitor)
     {
         visitor->trace(m_queue);
         ExecutionContext::trace(visitor);
     }
 
-    virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) OVERRIDE { }
-    virtual SecurityContext& securityContext() OVERRIDE { return *this; }
-
 #if !ENABLE(OILPAN)
     using RefCounted<NullExecutionContext>::ref;
     using RefCounted<NullExecutionContext>::deref;