summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 19:57:38 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 19:57:38 +0000
commit9783fac6b4e00309fb643bd3a9c5435c939a04eb (patch)
treeec713c59c4e964e3627e5f6ccc92bdb8166ea664 /ui
parente26020469bc0ecf2a31471465fd6782465b9be1c (diff)
downloadchromium_src-9783fac6b4e00309fb643bd3a9c5435c939a04eb.zip
chromium_src-9783fac6b4e00309fb643bd3a9c5435c939a04eb.tar.gz
chromium_src-9783fac6b4e00309fb643bd3a9c5435c939a04eb.tar.bz2
ui/base: Get rid of UiBaseTestSuite class.
This class is overriding some methods from base::TestSuite but not adding anything useful, so just get rid of it entirely. BUG=None TEST=ui_unittests R=rsesek@chromium.org,phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/7170024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/run_all_unittests.cc4
-rw-r--r--ui/base/test_suite.h38
2 files changed, 2 insertions, 40 deletions
diff --git a/ui/base/run_all_unittests.cc b/ui/base/run_all_unittests.cc
index 3be8d08..7fd6ef2 100644
--- a/ui/base/run_all_unittests.cc
+++ b/ui/base/run_all_unittests.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/test_suite.h"
+#include "base/test/test_suite.h"
int main(int argc, char** argv) {
- return UiBaseTestSuite(argc, argv).Run();
+ return base::TestSuite(argc, argv).Run();
}
diff --git a/ui/base/test_suite.h b/ui/base/test_suite.h
deleted file mode 100644
index c548d6a..0000000
--- a/ui/base/test_suite.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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.
-
-#ifndef UI_BASE_TEST_SUITE_H_
-#define UI_BASE_TEST_SUITE_H_
-#pragma once
-
-#include "build/build_config.h"
-
-#include "base/path_service.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/test/test_suite.h"
-#include "build/build_config.h"
-
-#if defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
-#endif
-
-class UiBaseTestSuite : public base::TestSuite {
- public:
- UiBaseTestSuite(int argc, char** argv) : TestSuite(argc, argv) {
- }
-
- protected:
-
- virtual void Initialize() {
- base::mac::ScopedNSAutoreleasePool autorelease_pool;
-
- TestSuite::Initialize();
- }
-
- virtual void Shutdown() {
- TestSuite::Shutdown();
- }
-};
-
-#endif // UI_BASE_TEST_SUITE_H_