diff options
| -rw-r--r-- | chrome/chrome_tests.gypi | 2 | ||||
| -rw-r--r-- | chrome/renderer/page_click_tracker_browsertest.cc (renamed from chrome/renderer/page_click_tracker_unittest.cc) | 0 | ||||
| -rw-r--r-- | chrome/test/unit/run_all_unittests.cc | 41 |
3 files changed, 40 insertions, 3 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ac724f7..c46805b 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1719,7 +1719,6 @@ 'renderer/media/audio_renderer_impl_unittest.cc', 'renderer/net/predictor_queue_unittest.cc', 'renderer/net/renderer_predictor_unittest.cc', - 'renderer/page_click_tracker_unittest.cc', 'renderer/paint_aggregator_unittest.cc', 'renderer/render_process_unittest.cc', 'renderer/render_thread_unittest.cc', @@ -2202,6 +2201,7 @@ 'renderer/autofill/form_autocomplete_browsertest.cc', 'renderer/autofill/form_manager_browsertest.cc', 'renderer/autofill/password_autofill_manager_unittest.cc', + 'renderer/page_click_tracker_browsertest.cc', 'renderer/pepper_devices_browsertest.cc', 'renderer/render_view_browsertest.cc', 'renderer/render_view_browsertest_mac.mm', diff --git a/chrome/renderer/page_click_tracker_unittest.cc b/chrome/renderer/page_click_tracker_browsertest.cc index ea8522a..ea8522a 100644 --- a/chrome/renderer/page_click_tracker_unittest.cc +++ b/chrome/renderer/page_click_tracker_browsertest.cc diff --git a/chrome/test/unit/run_all_unittests.cc b/chrome/test/unit/run_all_unittests.cc index 5534dbe..3364306 100644 --- a/chrome/test/unit/run_all_unittests.cc +++ b/chrome/test/unit/run_all_unittests.cc @@ -1,9 +1,46 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/test/unit/chrome_test_suite.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h" + +namespace { + +// A stubbed out webkit client impl. +class UnitTestWebKitClient : public WebKit::WebKitClient { + public: + UnitTestWebKitClient() { + } +}; + +// 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(&webkitclient_); + ChromeTestSuite::Initialize(); + } + virtual void Shutdown() { + ChromeTestSuite::Shutdown(); + WebKit::shutdown(); + } + + UnitTestWebKitClient webkitclient_; +}; + +} // namespace int main(int argc, char **argv) { - return ChromeTestSuite(argc, argv).Run(); + return UnitTestTestSuite(argc, argv).Run(); } |