Remove WebKit::Platform dependencies from cc

Remove WebKit::Platform dependencies from cc

This removes all dependencies on the static WebKit::Platform pointer from cc.
The biggest change is implementing cc::Thread on top of base::MessageLoopProxy
instead of WebKit::WebThread. For the main thread cc::Thread simply binds to
the current thread's MessageLoopProxy. For the impl thread, the bindings layer
(specifically webkit/compositor_bindings/web_compositor_impl) extracts the
MessageLoopProxy out of the passed in WebThread.

BUG=144539
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=165050

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=165060

[jamesr, 2012-10-28 22:12:28]

This depends on http://codereview.chromium.org/11191068/

@aelias - this should complement http://codereview.chromium.org/11232051/ very
nicely.  With both landed, we won't have any dependencies on static thread
pointers or static WebKit::Platform::current() pointers.

[enne (OOO), 2012-10-29 17:40:42]

http://codereview.chromium.org/11344004/diff/3001/cc/scoped_thread_proxy.h
File cc/scoped_thread_proxy.h (right):

http://codereview.chromium.org/11344004/diff/3001/cc/scoped_thread_proxy.h#ne...
cc/scoped_thread_proxy.h:26: class ScopedThreadProxy : public
base::RefCounted<ScopedThreadProxy> {
Sanity checking: this doesn't need to be thread-safe refcounted, because it's
only ref'd by cc::ThreadProxy? (Although in that case, why is it ref counted at
all?)

http://codereview.chromium.org/11344004/diff/3001/cc/test/scheduler_test_comm...
File cc/test/scheduler_test_common.cc (right):

http://codereview.chromium.org/11344004/diff/3001/cc/test/scheduler_test_comm...
cc/test/scheduler_test_common.cc:36: postDelayedTask(cb, 0);
Why did this change from NOTREACHED() to postDelayedTask?

http://codereview.chromium.org/11344004/diff/3001/cc/thread_impl.cc
File cc/thread_impl.cc (right):

http://codereview.chromium.org/11344004/diff/3001/cc/thread_impl.cc#newcode32
cc/thread_impl.cc:32: m_thread->PostDelayedTask(FROM_HERE, cb,
base::TimeDelta::FromMilliseconds(delayMs));
Wrapping all the postDelayedTask calls like this make the FROM_HERE macro
useless.

Can cc::Thread go away entirely, such that cc just uses base::MessageLoopProxy
directly?

[jamesr, 2012-10-29 18:03:52]

On 2012/10/29 17:40:42, enne wrote:
> http://codereview.chromium.org/11344004/diff/3001/cc/scoped_thread_proxy.h
> File cc/scoped_thread_proxy.h (right):
> 
>
http://codereview.chromium.org/11344004/diff/3001/cc/scoped_thread_proxy.h#ne...
> cc/scoped_thread_proxy.h:26: class ScopedThreadProxy : public
> base::RefCounted<ScopedThreadProxy> {
> Sanity checking: this doesn't need to be thread-safe refcounted, because it's
> only ref'd by cc::ThreadProxy? (Although in that case, why is it ref counted
at
> all?)

It's refed by cc::ThreadProxy _and_ tasks posted to it.  The tasks are typically
posted from the impl thread, so this probably should be ThreadSafeRefCounted.

> 
>
http://codereview.chromium.org/11344004/diff/3001/cc/test/scheduler_test_comm...
> File cc/test/scheduler_test_common.cc (right):
> 
>
http://codereview.chromium.org/11344004/diff/3001/cc/test/scheduler_test_comm...
> cc/test/scheduler_test_common.cc:36: postDelayedTask(cb, 0);
> Why did this change from NOTREACHED() to postDelayedTask?

This codepath was hit by cc::Timer, which always does postDelayedTask() (as does
WebCore::Timer if you punch through all the indirections).  Several of the
callers (cc/resource_update_controller.cc) actually want zero delay, so
postTask() makes more sense.  This just shares the implementation between the
two.

> 
> http://codereview.chromium.org/11344004/diff/3001/cc/thread_impl.cc
> File cc/thread_impl.cc (right):
> 
> http://codereview.chromium.org/11344004/diff/3001/cc/thread_impl.cc#newcode32
> cc/thread_impl.cc:32: m_thread->PostDelayedTask(FROM_HERE, cb,
> base::TimeDelta::FromMilliseconds(delayMs));
> Wrapping all the postDelayedTask calls like this make the FROM_HERE macro
> useless.
> 
> Can cc::Thread go away entirely, such that cc just uses base::MessageLoopProxy
> directly?

I think it can - and if it did that'd be cool since we could get all of
base::Callback (like partial binding) without having to wrap it ourselves. 
However, this patch was already pretty sure and I'm not sure how to implement
the tests currently relying on FakeThread from cc/test/scheduler_test_common.h
on top of base:: primitives.

[enne (OOO), 2012-10-29 22:14:09]

lgtm

Could you file a bug to remove cc::Thread entirely in some other patch?

[jamesr, 2012-10-29 23:25:51]

On 2012/10/29 22:14:09, enne wrote:
> lgtm
> 
> Could you file a bug to remove cc::Thread entirely in some other patch?

http://code.google.com/p/chromium/issues/detail?id=158423

[commit-bot: I haz the power, 2012-10-29 23:52:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11344004/10002

[commit-bot: I haz the power, 2012-10-30 01:13:38]

Retried try job too often for step(s) browser_tests

[commit-bot: I haz the power, 2012-10-30 01:22:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11344004/10002

[commit-bot: I haz the power, 2012-10-30 01:22:33]

Failed to apply patch for cc/test/layer_tree_test_common.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/test/layer_tree_test_common.cc
  Hunk #3 FAILED at 291.
  1 out of 5 hunks FAILED -- saving rejects to file
cc/test/layer_tree_test_common.cc.rej

Patch:       cc/test/layer_tree_test_common.cc
Index: cc/test/layer_tree_test_common.cc
diff --git a/cc/test/layer_tree_test_common.cc
b/cc/test/layer_tree_test_common.cc
index
0d77c67bedaefb1e77c73a4306ebbd0fe569712c..da3f43070fcc0e2ec271be9b454cafe1df820fbe
100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -17,17 +17,15 @@
 #include "cc/scoped_thread_proxy.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
+#include "cc/thread_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/test/test_common.h"
 #include "cc/test/tiled_layer_test_common.h"
-#include "cc/thread_task.h"
 #include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include <public/Platform.h>
-#include <public/WebCompositorSupport.h>
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 #include <public/WebThread.h>
@@ -270,50 +268,6 @@ private:
     TestHooks* m_testHooks;
 };
 
-class TimeoutTask : public WebThread::Task {
-public:
-    explicit TimeoutTask(ThreadedTest* test)
-        : m_test(test)
-    {
-    }
-
-    void clearTest()
-    {
-        m_test = 0;
-    }
-
-    virtual ~TimeoutTask()
-    {
-        if (m_test)
-            m_test->clearTimeout();
-    }
-
-    virtual void run()
-    {
-        if (m_test)
-            m_test->timeout();
-    }
-
-private:
-    ThreadedTest* m_test;
-};
-
-class BeginTask : public WebThread::Task {
-public:
-    explicit BeginTask(ThreadedTest* test)
-        : m_test(test)
-    {
-    }
-
-    virtual ~BeginTask() { }
-    virtual void run()
-    {
-        m_test->doBeginTest();
-    }
-private:
-    ThreadedTest* m_test;
-};
-
 ThreadedTest::ThreadedTest()
     : m_beginning(false)
     , m_endWhenBeginReturns(false)
@@ -337,57 +291,57 @@ void ThreadedTest::endTest()
     if (m_beginning)
         m_endWhenBeginReturns = true;
     else
-        m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::realEndTest));
+        m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::realEndTest, base::Unretained(this)));
 }
 
 void ThreadedTest::endTestAfterDelay(int delayMilliseconds)
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::endTest));
+    m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::endTest,
base::Unretained(this)));
 }
 
 void ThreadedTest::postSetNeedsAnimateToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetNeedsAnimate));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetNeedsAnimate, base::Unretained(this)));
 }
 
 void ThreadedTest::postAddAnimationToMainThread(Layer* layerToReceiveAnimation)
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchAddAnimation, layerToReceiveAnimation));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchAddAnimation, base::Unretained(this),
base::Unretained(layerToReceiveAnimation)));
 }
 
 void ThreadedTest::postAddInstantAnimationToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchAddInstantAnimation));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchAddInstantAnimation, base::Unretained(this)));
 }
 
 void ThreadedTest::postSetNeedsCommitToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetNeedsCommit));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetNeedsCommit, base::Unretained(this)));
 }
 
 void ThreadedTest::postAcquireLayerTextures()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchAcquireLayerTextures));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchAcquireLayerTextures,
base::Unretained(this)));
 }
 
 void ThreadedTest::postSetNeedsRedrawToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetNeedsRedraw));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetNeedsRedraw, base::Unretained(this)));
 }
 
 void ThreadedTest::postSetNeedsAnimateAndCommitToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetNeedsAnimateAndCommit));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetNeedsAnimateAndCommit,
base::Unretained(this)));
 }
 
 void ThreadedTest::postSetVisibleToMainThread(bool visible)
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetVisible, visible));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetVisible, base::Unretained(this), visible));
 }
 
 void ThreadedTest::postDidAddAnimationToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchDidAddAnimation));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchDidAddAnimation, base::Unretained(this)));
 }
 
 void ThreadedTest::doBeginTest()
@@ -425,13 +379,13 @@ void ThreadedTest::scheduleComposite()
     if (!m_started || m_scheduled || m_finished)
         return;
     m_scheduled = true;
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchComposite));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchComposite, base::Unretained(this)));
 }
 
 void ThreadedTest::realEndTest()
 {
     DCHECK(Proxy::isMainThread());
-    WebKit::Platform::current()->currentThread()->exitRunLoop();
+    MessageLoop::current()->Quit();
 }
 
 void ThreadedTest::dispatchSetNeedsAnimate()
@@ -549,38 +503,36 @@ void ThreadedTest::runTest(bool threaded)
     Settings::setAcceleratedAnimationEnabled(true);
 
     if (threaded) {
-       
m_webThread.reset(WebKit::Platform::current()->createThread("ThreadedTest"));
-       
Platform::current()->compositorSupport()->initialize(m_webThread.get());
-    } else
-        Platform::current()->compositorSupport()->initialize(0);
+        m_implThread.reset(new base::Thread("ThreadedTest"));
+        ASSERT_TRUE(m_implThread->Start());
+        m_implCCThread =
cc::ThreadImpl::createForDifferentThread(m_implThread->message_loop_proxy());
+        cc::Proxy::setImplThread(m_implCCThread.get());
+    }
 
     DCHECK(Proxy::isMainThread());
     m_mainThreadProxy = ScopedThreadProxy::create(Proxy::mainThread());
 
     initializeSettings(m_settings);
 
-    m_beginTask = new BeginTask(this);
-    WebKit::Platform::current()->currentThread()->postDelayedTask(m_beginTask,
0); // postDelayedTask takes ownership of the task
-    m_timeoutTask = new TimeoutTask(this);
-   
WebKit::Platform::current()->currentThread()->postDelayedTask(m_timeoutTask,
5000);
-    WebKit::Platform::current()->currentThread()->enterRunLoop();
-
+    cc::Proxy::mainThread()->postTask(base::Bind(&ThreadedTest::doBeginTest,
base::Unretained(this)));
+    m_timeout.Reset(base::Bind(&ThreadedTest::timeout,
base::Unretained(this)));
+    cc::Proxy::mainThread()->postDelayedTask(m_timeout.callback(), 5000);
+    MessageLoop::current()->Run();
     if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer())
         m_layerTreeHost->rootLayer()->setLayerTreeHost(0);
     m_layerTreeHost.reset();
 
-    if (m_timeoutTask)
-        m_timeoutTask->clearTest();
+    cc::Proxy::setImplThread(0);
+
+    m_timeout.Cancel();
 
     ASSERT_FALSE(m_layerTreeHost.get());
     m_client.reset();
     if (m_timedOut) {
         FAIL() << "Test timed out";
-        Platform::current()->compositorSupport()->shutdown();
         return;
     }
     afterTest();
-    Platform::current()->compositorSupport()->shutdown();
 }
 
 }  // namespace WebKitTests

[commit-bot: I haz the power, 2012-10-30 20:29:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11344004/12002

[commit-bot: I haz the power, 2012-10-30 22:55:16]

Failed to apply patch for cc/test/layer_tree_test_common.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/test/layer_tree_test_common.cc
  Hunk #3 FAILED at 291.
  1 out of 5 hunks FAILED -- saving rejects to file
cc/test/layer_tree_test_common.cc.rej

Patch:       cc/test/layer_tree_test_common.cc
Index: cc/test/layer_tree_test_common.cc
diff --git a/cc/test/layer_tree_test_common.cc
b/cc/test/layer_tree_test_common.cc
index
2bb5d41ba5176758c09d417cb403c9548211551b..4fee06ca83fb029b34883ea998265ea98e2eeddb
100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -17,17 +17,15 @@
 #include "cc/scoped_thread_proxy.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
+#include "cc/thread_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/test/test_common.h"
 #include "cc/test/tiled_layer_test_common.h"
-#include "cc/thread_task.h"
 #include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include <public/Platform.h>
-#include <public/WebCompositorSupport.h>
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 #include <public/WebThread.h>
@@ -270,50 +268,6 @@ private:
     TestHooks* m_testHooks;
 };
 
-class TimeoutTask : public WebThread::Task {
-public:
-    explicit TimeoutTask(ThreadedTest* test)
-        : m_test(test)
-    {
-    }
-
-    void clearTest()
-    {
-        m_test = 0;
-    }
-
-    virtual ~TimeoutTask()
-    {
-        if (m_test)
-            m_test->clearTimeout();
-    }
-
-    virtual void run()
-    {
-        if (m_test)
-            m_test->timeout();
-    }
-
-private:
-    ThreadedTest* m_test;
-};
-
-class BeginTask : public WebThread::Task {
-public:
-    explicit BeginTask(ThreadedTest* test)
-        : m_test(test)
-    {
-    }
-
-    virtual ~BeginTask() { }
-    virtual void run()
-    {
-        m_test->doBeginTest();
-    }
-private:
-    ThreadedTest* m_test;
-};
-
 ThreadedTest::ThreadedTest()
     : m_beginning(false)
     , m_endWhenBeginReturns(false)
@@ -337,57 +291,57 @@ void ThreadedTest::endTest()
     if (m_beginning)
         m_endWhenBeginReturns = true;
     else
-        m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::realEndTest));
+        m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::realEndTest, base::Unretained(this)));
 }
 
 void ThreadedTest::endTestAfterDelay(int delayMilliseconds)
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::endTest));
+    m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::endTest,
base::Unretained(this)));
 }
 
 void ThreadedTest::postSetNeedsAnimateToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetNeedsAnimate));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetNeedsAnimate, base::Unretained(this)));
 }
 
 void ThreadedTest::postAddAnimationToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchAddAnimation));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchAddAnimation, base::Unretained(this)));
 }
 
 void ThreadedTest::postAddInstantAnimationToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchAddInstantAnimation));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchAddInstantAnimation, base::Unretained(this)));
 }
 
 void ThreadedTest::postSetNeedsCommitToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetNeedsCommit));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetNeedsCommit, base::Unretained(this)));
 }
 
 void ThreadedTest::postAcquireLayerTextures()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchAcquireLayerTextures));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchAcquireLayerTextures,
base::Unretained(this)));
 }
 
 void ThreadedTest::postSetNeedsRedrawToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetNeedsRedraw));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetNeedsRedraw, base::Unretained(this)));
 }
 
 void ThreadedTest::postSetNeedsAnimateAndCommitToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetNeedsAnimateAndCommit));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetNeedsAnimateAndCommit,
base::Unretained(this)));
 }
 
 void ThreadedTest::postSetVisibleToMainThread(bool visible)
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchSetVisible, visible));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchSetVisible, base::Unretained(this), visible));
 }
 
 void ThreadedTest::postDidAddAnimationToMainThread()
 {
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchDidAddAnimation));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchDidAddAnimation, base::Unretained(this)));
 }
 
 void ThreadedTest::doBeginTest()
@@ -425,13 +379,13 @@ void ThreadedTest::scheduleComposite()
     if (!m_started || m_scheduled || m_finished)
         return;
     m_scheduled = true;
-    m_mainThreadProxy->postTask(createThreadTask(this,
&ThreadedTest::dispatchComposite));
+    m_mainThreadProxy->postTask(FROM_HERE,
base::Bind(&ThreadedTest::dispatchComposite, base::Unretained(this)));
 }
 
 void ThreadedTest::realEndTest()
 {
     DCHECK(Proxy::isMainThread());
-    WebKit::Platform::current()->currentThread()->exitRunLoop();
+    MessageLoop::current()->Quit();
 }
 
 void ThreadedTest::dispatchSetNeedsAnimate()
@@ -549,38 +503,36 @@ void ThreadedTest::runTest(bool threaded)
     Settings::setAcceleratedAnimationEnabled(true);
 
     if (threaded) {
-       
m_webThread.reset(WebKit::Platform::current()->createThread("ThreadedTest"));
-       
Platform::current()->compositorSupport()->initialize(m_webThread.get());
-    } else
-        Platform::current()->compositorSupport()->initialize(0);
+        m_implThread.reset(new base::Thread("ThreadedTest"));
+        ASSERT_TRUE(m_implThread->Start());
+        m_implCCThread =
cc::ThreadImpl::createForDifferentThread(m_implThread->message_loop_proxy());
+        cc::Proxy::setImplThread(m_implCCThread.get());
+    }
 
     DCHECK(Proxy::isMainThread());
     m_mainThreadProxy = ScopedThreadProxy::create(Proxy::mainThread());
 
     initializeSettings(m_settings);
 
-    m_beginTask = new BeginTask(this);
-    WebKit::Platform::current()->currentThread()->postDelayedTask(m_beginTask,
0); // postDelayedTask takes ownership of the task
-    m_timeoutTask = new TimeoutTask(this);
-   
WebKit::Platform::current()->currentThread()->postDelayedTask(m_timeoutTask,
5000);
-    WebKit::Platform::current()->currentThread()->enterRunLoop();
-
+    cc::Proxy::mainThread()->postTask(base::Bind(&ThreadedTest::doBeginTest,
base::Unretained(this)));
+    m_timeout.Reset(base::Bind(&ThreadedTest::timeout,
base::Unretained(this)));
+    cc::Proxy::mainThread()->postDelayedTask(m_timeout.callback(), 5000);
+    MessageLoop::current()->Run();
     if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer())
         m_layerTreeHost->rootLayer()->setLayerTreeHost(0);
     m_layerTreeHost.reset();
 
-    if (m_timeoutTask)
-        m_timeoutTask->clearTest();
+    cc::Proxy::setImplThread(0);
+
+    m_timeout.Cancel();
 
     ASSERT_FALSE(m_layerTreeHost.get());
     m_client.reset();
     if (m_timedOut) {
         FAIL() << "Test timed out";
-        Platform::current()->compositorSupport()->shutdown();
         return;
     }
     afterTest();
-    Platform::current()->compositorSupport()->shutdown();
 }
 
 }  // namespace WebKitTests

[Sergey Ulanov, 2012-10-30 23:22:17]

reverted because it broke windows build:
http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20Builder&nu...