diff options
-rw-r--r-- | ui/events/events.gyp | 6 | ||||
-rw-r--r-- | ui/events/test/run_all_unittests.cc | 15 | ||||
-rw-r--r-- | ui/events/test/test_suite.cc | 19 | ||||
-rw-r--r-- | ui/events/test/test_suite.h | 23 |
4 files changed, 2 insertions, 61 deletions
diff --git a/ui/events/events.gyp b/ui/events/events.gyp index da722ea..113300d 100644 --- a/ui/events/events.gyp +++ b/ui/events/events.gyp @@ -178,13 +178,14 @@ 'type': '<(gtest_target_type)', 'dependencies': [ '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/base/base.gyp:run_all_unittests', '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/testing/gtest.gyp:gtest', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', 'dom4_keycode_converter', - 'events_base', 'events', + 'events_base', 'events_test_support', ], 'sources': [ @@ -194,9 +195,6 @@ 'gestures/velocity_calculator_unittest.cc', 'keycodes/dom4/keycode_converter_unittest.cc', 'latency_info_unittest.cc', - 'test/run_all_unittests.cc', - 'test/test_suite.cc', - 'test/test_suite.h', 'ozone/evdev/key_event_converter_unittest.cc', 'ozone/evdev/touch_event_converter_unittest.cc', 'x/events_x_unittest.cc', diff --git a/ui/events/test/run_all_unittests.cc b/ui/events/test/run_all_unittests.cc deleted file mode 100644 index dab855c..0000000 --- a/ui/events/test/run_all_unittests.cc +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2013 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 "base/bind.h" -#include "base/test/launcher/unit_test_launcher.h" -#include "ui/events/test/test_suite.h" - -int main(int argc, char** argv) { - ui::test::EventsTestSuite test_suite(argc, argv); - return base::LaunchUnitTests(argc, - argv, - base::Bind(&ui::test::EventsTestSuite::Run, - base::Unretained(&test_suite))); -} diff --git a/ui/events/test/test_suite.cc b/ui/events/test/test_suite.cc deleted file mode 100644 index 3590406..0000000 --- a/ui/events/test/test_suite.cc +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 2013 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 "ui/events/test/test_suite.h" - -#include "build/build_config.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace ui { -namespace test { - -EventsTestSuite::EventsTestSuite(int argc, char** argv) - : TestSuite(argc, argv) {} - -EventsTestSuite::~EventsTestSuite() {} - -} // namespace test -} // namespace ui diff --git a/ui/events/test/test_suite.h b/ui/events/test/test_suite.h deleted file mode 100644 index 12ba973..0000000 --- a/ui/events/test/test_suite.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2013 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. - -#ifndef UI_EVENTS_TEST_TEST_SUITE_H_ -#define UI_EVENTS_TEST_TEST_SUITE_H_ - -#include "base/compiler_specific.h" -#include "base/test/test_suite.h" - -namespace ui { -namespace test { - -class EventsTestSuite : public base::TestSuite { - public: - EventsTestSuite(int argc, char** argv); - virtual ~EventsTestSuite(); -}; - -} // namespace test -} // namespace ui - -#endif // UI_EVENTS_TEST_TEST_SUITE_H_ |