ui/gfx: Move test_suite.{cc,h} to test/ directory.
TEST=ui_unittests
[email protected]
[email protected]
Review URL: https://chromiumcodereview.appspot.com/9861012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129193 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/gfx/run_all_unittests.cc b/ui/gfx/run_all_unittests.cc
index 96dd068..98c55ad1 100644
--- a/ui/gfx/run_all_unittests.cc
+++ b/ui/gfx/run_all_unittests.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/gfx/test_suite.h"
+#include "ui/gfx/test/test_suite.h"
int main(int argc, char** argv) {
- return GfxTestSuite(argc, argv).Run();
+ return gfx::test::GfxTestSuite(argc, argv).Run();
}
diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test/test_suite.cc
similarity index 94%
rename from ui/gfx/test_suite.cc
rename to ui/gfx/test/test_suite.cc
index 4a26607..2089ea9 100644
--- a/ui/gfx/test_suite.cc
+++ b/ui/gfx/test/test_suite.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/gfx/test_suite.h"
+#include "ui/gfx/test/test_suite.h"
#include "base/file_path.h"
#include "base/path_service.h"
@@ -15,6 +15,9 @@
#include "base/mac/bundle_locations.h"
#endif
+namespace gfx {
+namespace test {
+
GfxTestSuite::GfxTestSuite(int argc, char** argv) : TestSuite(argc, argv) {}
void GfxTestSuite::Initialize() {
@@ -60,3 +63,6 @@
#endif
base::TestSuite::Shutdown();
}
+
+} // namespace test
+} // namespace gfx
diff --git a/ui/gfx/test/test_suite.h b/ui/gfx/test/test_suite.h
new file mode 100644
index 0000000..81ee8a2
--- /dev/null
+++ b/ui/gfx/test/test_suite.h
@@ -0,0 +1,32 @@
+// Copyright (c) 2012 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_GFX_TEST_TEST_SUITE_H_
+#define UI_GFX_TEST_TEST_SUITE_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/test/test_suite.h"
+
+namespace gfx {
+namespace test {
+
+class GfxTestSuite : public base::TestSuite {
+ public:
+ GfxTestSuite(int argc, char** argv);
+
+ protected:
+ // base::TestSuite:
+ virtual void Initialize() OVERRIDE;
+ virtual void Shutdown() OVERRIDE;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(GfxTestSuite);
+};
+
+} // namespace test
+} // namespace gfx
+
+#endif // UI_GFX_TEST_TEST_SUITE_H_
diff --git a/ui/gfx/test_suite.h b/ui/gfx/test_suite.h
deleted file mode 100644
index 02e5ef1..0000000
--- a/ui/gfx/test_suite.h
+++ /dev/null
@@ -1,22 +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_GFX_TEST_SUITE_H_
-#define UI_GFX_TEST_SUITE_H_
-#pragma once
-
-#include "base/compiler_specific.h"
-#include "base/test/test_suite.h"
-
-class GfxTestSuite : public base::TestSuite {
- public:
- GfxTestSuite(int argc, char** argv);
-
- protected:
- // base::TestSuite:
- virtual void Initialize() OVERRIDE;
- virtual void Shutdown() OVERRIDE;
-};
-
-#endif // UI_GFX_TEST_SUITE_H_
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 75664f8f..625471f 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -80,20 +80,20 @@
'gfx/codec/png_codec_unittest.cc',
'gfx/color_analysis_unittest.cc',
'gfx/color_utils_unittest.cc',
- 'gfx/font_unittest.cc',
'gfx/font_list_unittest.cc',
+ 'gfx/font_unittest.cc',
'gfx/image/image_mac_unittest.mm',
'gfx/image/image_unittest.cc',
- 'gfx/image/image_unittest_util.h',
'gfx/image/image_unittest_util.cc',
+ 'gfx/image/image_unittest_util.h',
'gfx/insets_unittest.cc',
'gfx/rect_unittest.cc',
'gfx/run_all_unittests.cc',
'gfx/screen_unittest.cc',
'gfx/skbitmap_operations_unittest.cc',
'gfx/skia_util_unittest.cc',
- 'gfx/test_suite.cc',
- 'gfx/test_suite.h',
+ 'gfx/test/test_suite.cc',
+ 'gfx/test/test_suite.h',
'gfx/transform_util_unittest.cc',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
],
