1 files changed, 7 insertions, 10 deletions
diff --git a/WebKit/chromium/tests/RunAllTests.cpp b/WebKit/chromium/tests/RunAllTests.cpp
index 0f3f82f..cfcfbee 100644
--- a/WebKit/chromium/tests/RunAllTests.cpp
+++ b/WebKit/chromium/tests/RunAllTests.cpp
@@ -33,18 +33,15 @@
 
 #include "WebKit.h"
 #include "WebKitClient.h"
-
-// WebKitClient has a protected destructor, so we need to subclass.
-class DummyWebKitClient : public WebKit::WebKitClient {
-};
+#include <webkit/support/webkit_support.h>
 
 int main(int argc, char** argv)
 {
-    DummyWebKitClient dummyClient;
-    WebKit::initialize(&dummyClient);
-
-    int result = TestSuite(argc, argv).Run();
-
-    WebKit::shutdown();
+    TestSuite testSuite(argc, argv);
+    // TestSuite must be created before SetUpTestEnvironment so it performs
+    // initializations needed by WebKit support.
+    webkit_support::SetUpTestEnvironmentForUnitTests();
+    int result = testSuite.Run();
+    webkit_support::TearDownTestEnvironment();
     return result;
 }