Tidy up CompositorWorkerManager unit tests.

Source/modules/compositorworker/CompositorWorkerManagerTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/compositorworker/CompositorWorkerManager.h"
 
 #include "bindings/core/v8/ScriptSourceCode.h"
+#include "core/inspector/ConsoleMessage.h"
 #include "core/testing/DummyPageHolder.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerObjectProxy.h"
-#include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "modules/compositorworker/CompositorWorkerThread.h"
 #include "platform/NotImplemented.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebWaitableEvent.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 namespace {
@@ skipping 23 matching lines @@
     {
         CompositorWorkerThread::terminateV8Execution();
         if (m_v8TerminationCallback)
             (*m_v8TerminationCallback)();
     }
 
     WebWaitableEvent* m_startEvent;
     OwnPtr<Function<void()>> m_v8TerminationCallback;
 };
 
+// A null WorkerObjectProxy, supplied when creating CompositorWorkerThreads.
+class TestCompositorWorkerObjectProxy : public WorkerObjectProxy {
+public:
+    static PassOwnPtr<TestCompositorWorkerObjectProxy> create(ExecutionContext* context)
+    {
+        return adoptPtr(new TestCompositorWorkerObjectProxy(context));
+    }
+
+    // (Empty) WorkerReportingProxy implementation:
+    virtual void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, int exceptionId) { }
+    virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) override { }
+    virtual void postMessageToPageInspector(const String&) override { }
+    virtual void postWorkerConsoleAgentEnabled() override { }
+
+    virtual void didEvaluateWorkerScript(bool success) override { }
+    virtual void workerGlobalScopeStarted(WorkerGlobalScope*) override { }
+    virtual void workerGlobalScopeClosed() override { }
+    virtual void workerThreadTerminated() override { }
+    virtual void willDestroyWorkerGlobalScope() override { }
+private:
+    TestCompositorWorkerObjectProxy(ExecutionContext* context)

[haraken, 2015/06/07 23:37:11]

Add explicit.

+        : WorkerObjectProxy(context, nullptr)
+    {
+    }
+};
+
 } // namespace
 
 class CompositorWorkerManagerTest : public testing::Test {
 public:
     void SetUp() override
     {
         m_page = DummyPageHolder::create();
-        m_objectProxy = WorkerObjectProxy::create(&m_page->document(), nullptr);
+        m_objectProxy = TestCompositorWorkerObjectProxy::create(&m_page->document());
         m_securityOrigin = SecurityOrigin::create(KURL(ParsedURLString, "http://fake.url/"));
     }
 
     void TearDown() override
     {
         ASSERT(!managerHasThread());
         ASSERT(!managerHasIsolate());
         m_page.clear();
     }
 
     PassRefPtr<TestCompositorWorkerThread> createCompositorWorker(WebWaitableEvent* startEvent)
     {
         TestCompositorWorkerThread* workerThread = new TestCompositorWorkerThread(nullptr, *m_objectProxy, 0, startEvent);
+        OwnPtrWillBeRawPtr<WorkerClients> clients = nullptr;
         workerThread->start(WorkerThreadStartupData::create(
             KURL(ParsedURLString, "http://fake.url/"),
             "fake user agent",
             "//fake source code",
             nullptr,
             DontPauseWorkerGlobalScopeOnStart,
             adoptPtr(new Vector<CSPHeaderAndType>()),
             m_securityOrigin.get(),
-            WorkerClients::create(),
+            clients.release(),

[haraken, 2015/06/07 23:37:11]

Can we just write 'nullptr'?

             V8CacheOptionsDefault));
         return adoptRef(workerThread);
     }
 
     void createWorkerAdapter(RefPtr<CompositorWorkerThread>* workerThread, WebWaitableEvent* creationEvent)
     {
         *workerThread = createCompositorWorker(creationEvent);
     }
 
     // Attempts to run some simple script for |worker|.
@@ skipping 127 matching lines @@
     v8::Isolate* secondIsolate = secondWorker->isolate();
     ASSERT(secondIsolate);
     EXPECT_EQ(firstIsolate, secondIsolate);
 
     // Verify that the isolate can run some scripts correctly in the second worker.
     checkWorkerCanExecuteScript(secondWorker.get());
     secondWorker->terminateAndWait();
 }
 
 } // namespace blink