1 files changed, 5 insertions, 0 deletions
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc
index 4ea8697..d0fddbc 100644
--- a/cc/test/run_all_unittests.cc
+++ b/cc/test/run_all_unittests.cc
@@ -4,13 +4,18 @@
 
 #include "base/message_loop.h"
 #include "base/test/test_suite.h"
+#include "cc/thread_impl.h"
+#include "cc/proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleMock(&argc, argv);
   TestSuite test_suite(argc, argv);
   MessageLoop message_loop;
+  scoped_ptr<cc::Thread> mainCCThread = cc::ThreadImpl::createForCurrentThread();
+  cc::Proxy::setMainThread(mainCCThread.get());
   int result = test_suite.Run();
 
   return result;
 }
+