Move in-process-webkit unit tests to content unit tests target

BUG=90443
TEST=nothing breaks


Review URL: http://codereview.chromium.org/8208008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105955 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 45 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index ab922b7..4426d5c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1905,8 +1905,6 @@
         'test/base/v8_unit_test.h',
         'test/data/resource.rc',
         'tools/convert_dict/convert_dict_unittest.cc',
-        '../content/browser/in_process_webkit/dom_storage_unittest.cc',
-        '../content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc',
         '../content/browser/renderer_host/render_widget_host_unittest.cc',
         '../content/browser/renderer_host/text_input_client_mac_unittest.mm',
         '../content/browser/tab_contents/navigation_controller_unittest.cc',
diff --git a/chrome/test/base/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc
index a1b8746..42d284a 100644
--- a/chrome/test/base/run_all_unittests.cc
+++ b/chrome/test/base/run_all_unittests.cc
@@ -3,49 +3,8 @@
 // found in the LICENSE file.
 
 #include "chrome/test/base/chrome_test_suite.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h"
-
-namespace {
-
-// A stubbed out webkit client impl.
-class UnitTestWebKitPlatformSupport : public WebKit::WebKitPlatformSupport {
- public:
-  UnitTestWebKitPlatformSupport() {
-  }
-
-  virtual void cryptographicallyRandomValues(
-      unsigned char* buffer, size_t length) {
-    memset(buffer, 0, length);
-  }
-};
-
-// A special test suite that also initializes webkit once for all unittests.
-// This is useful for two reasons:
-// 1. It allows the use of some primitive webkit data types like WebString.
-// 2. Individual unittests should not be initting webkit on their own, initting
-// it here ensures attempts to do so within an individual test will fail.
-class UnitTestTestSuite : public ChromeTestSuite {
- public:
-  UnitTestTestSuite(int argc, char** argv)
-      : ChromeTestSuite(argc, argv) {
-  }
-
- protected:
-  virtual void Initialize() {
-    WebKit::initialize(&webkit_platform_support_);
-    ChromeTestSuite::Initialize();
-  }
-  virtual void Shutdown() {
-    ChromeTestSuite::Shutdown();
-    WebKit::shutdown();
-  }
-
-  UnitTestWebKitPlatformSupport webkit_platform_support_;
-};
-
-}  // namespace
+#include "content/test/unittest_test_suite.h"
 
 int main(int argc, char **argv) {
-  return UnitTestTestSuite(argc, argv).Run();
+  return UnitTestTestSuite(new ChromeTestSuite(argc, argv)).Run();
 }