summaryrefslogtreecommitdiffstats
path: root/cc/test/run_all_unittests.cc
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 22:59:56 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 22:59:56 +0000
commite5e9c02081e6b37f49febeba87863a1dac598949 (patch)
tree3e2c4fcd2926cc064fd7937e3cdee49e9ef62fd6 /cc/test/run_all_unittests.cc
parent760d9886b9d56182f6c91944e06f250df6677d33 (diff)
downloadchromium_src-e5e9c02081e6b37f49febeba87863a1dac598949.zip
chromium_src-e5e9c02081e6b37f49febeba87863a1dac598949.tar.gz
chromium_src-e5e9c02081e6b37f49febeba87863a1dac598949.tar.bz2
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 Review URL: https://codereview.chromium.org/11344004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/run_all_unittests.cc')
-rw-r--r--cc/test/run_all_unittests.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc
index 9132bab..d0fddbc 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;
}