Switch webkit_unit_tests to use the new test launcher.

Source/web/tests/RunAllTests.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #if BLINK_IMPLEMENTATION
 #include "config.h"
 #endif
 
-// FIXME: Avoid this source dependency on Chromium's base module.
-#include <base/test/test_suite.h>
-
 #include "public/platform/Platform.h"
 #include "public/web/WebKit.h"
+#include "web/tests/WebUnitTests.h"
 #include <content/test/webkit_support.h>
 
-#if defined(BLINK_DLL_UNITTEST)
-#include "web/tests/WebUnitTests.h"
-#endif
+namespace {
 
-// TestSuite must be created before SetUpTestEnvironment so it performs
-// initializations needed by WebKit support. This is slightly complicated by the
-// fact that chromium multi-dll build requires that the TestSuite object be created
-// and run inside blink_web.dll.
+// Test helpers to support the fact that blink tests are gloriously complicated
+// in a shared library build. See WebUnitTests.h for more details.
+void preTestHook()
+{
+    content::SetUpTestEnvironmentForUnitTests();
+}
+
+void postTestHook()
+{
+    content::TearDownTestEnvironment();
+}
+
+} // namespace
+
 int main(int argc, char** argv)
 {
-#if defined(BLINK_DLL_UNITTEST)
-    blink::InitTestSuite(argc, argv);
-    content::SetUpTestEnvironmentForUnitTests();
-    int result = blink::RunAllUnitTests();
-    content::TearDownTestEnvironment();
-    blink::DeleteTestSuite();
-#else
-    TestSuite testSuite(argc, argv);
-    content::SetUpTestEnvironmentForUnitTests();
-    int result = testSuite.Run();
-    content::TearDownTestEnvironment();
-#endif
-
-    return result;
+    return blink::runWebTests(argc, argv, &preTestHook, &postTestHook);
 }