| Index: cc/test/run_all_unittests.cc
|
| diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc
|
| index 9132babe4cfef51bffc27ee86f833e2260bec1ec..d0fddbcd41425878886808ca50a06bb411d432ec 100644
|
| --- a/cc/test/run_all_unittests.cc
|
| +++ b/cc/test/run_all_unittests.cc
|
| @@ -4,18 +4,17 @@
|
|
|
| #include "base/message_loop.h"
|
| #include "base/test/test_suite.h"
|
| -#include "cc/test/test_webkit_platform.h"
|
| +#include "cc/thread_impl.h"
|
| +#include "cc/proxy.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
|
|
|
| int main(int argc, char** argv) {
|
| ::testing::InitGoogleMock(&argc, argv);
|
| TestSuite test_suite(argc, argv);
|
| - cc::TestWebKitPlatform platform;
|
| MessageLoop message_loop;
|
| - WebKit::Platform::initialize(&platform);
|
| + scoped_ptr<cc::Thread> mainCCThread = cc::ThreadImpl::createForCurrentThread();
|
| + cc::Proxy::setMainThread(mainCCThread.get());
|
| int result = test_suite.Run();
|
| - WebKit::Platform::shutdown();
|
|
|
| return result;
|
| }
|
|
|