Index: ui/gfx/compositor/test_suite.cc |
diff --git a/ui/gfx/compositor/test_suite.cc b/ui/gfx/compositor/test_suite.cc |
index f26cd314584e5a4d3e49a493d1364e3992c2d9d8..065f8fb08b8268162660e4eb21f986e35928477d 100644 |
--- a/ui/gfx/compositor/test_suite.cc |
+++ b/ui/gfx/compositor/test_suite.cc |
@@ -4,14 +4,23 @@ |
#include "ui/gfx/compositor/test_suite.h" |
+#include "base/message_loop.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/ui_base_paths.h" |
#include "ui/gfx/gfx_paths.h" |
#include "ui/gfx/gl/gl_implementation.h" |
+#include "webkit/glue/webkitplatformsupport_impl.h" |
+ |
+#if defined(USE_WEBKIT_COMPOSITOR) |
+#include "ui/gfx/compositor/compositor_cc.h" |
+#endif |
CompositorTestSuite::CompositorTestSuite(int argc, char** argv) |
: TestSuite(argc, argv) {} |
+CompositorTestSuite::~CompositorTestSuite() {} |
+ |
void CompositorTestSuite::Initialize() { |
#if defined(OS_LINUX) |
gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); |
@@ -24,9 +33,17 @@ void CompositorTestSuite::Initialize() { |
// Force unittests to run using en-US so if we test against string |
// output, it'll pass regardless of the system language. |
ui::ResourceBundle::InitSharedInstance("en-US"); |
+ |
+ message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); |
+ webkit_support_.reset(new webkit_glue::WebKitPlatformSupportImpl); |
+ WebKit::initialize(webkit_support_.get()); |
} |
void CompositorTestSuite::Shutdown() { |
+ WebKit::shutdown(); |
+ webkit_support_.reset(); |
+ message_loop_.reset(); |
+ |
ui::ResourceBundle::CleanupSharedInstance(); |
base::TestSuite::Shutdown(); |