Index: ui/views/test/run_all_unittests.cc |
diff --git a/ui/views/run_all_unittests.cc b/ui/views/test/run_all_unittests.cc |
similarity index 51% |
rename from ui/views/run_all_unittests.cc |
rename to ui/views/test/run_all_unittests.cc |
index 965e7c295f3b66bcdad051c6548e2f9605ab2b50..59824b631641be9ab43162e882649cf78b77472a 100644 |
--- a/ui/views/run_all_unittests.cc |
+++ b/ui/views/test/run_all_unittests.cc |
@@ -2,16 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/basictypes.h" |
#include "base/bind.h" |
-#include "base/compiler_specific.h" |
-#include "base/path_service.h" |
#include "base/test/launcher/unit_test_launcher.h" |
#include "base/test/test_suite.h" |
-#include "testing/gtest/include/gtest/gtest.h" |
-#include "ui/base/resource/resource_bundle.h" |
-#include "ui/base/ui_base_paths.h" |
-#include "ui/gl/gl_surface.h" |
+#include "ui/views/test/views_test_suite.h" |
class ViewTestSuite : public base::TestSuite { |
public: |
@@ -20,16 +14,11 @@ class ViewTestSuite : public base::TestSuite { |
protected: |
void Initialize() override { |
base::TestSuite::Initialize(); |
- gfx::GLSurface::InitializeOneOffForTests(); |
- ui::RegisterPathProvider(); |
- |
- base::FilePath ui_test_pak_path; |
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); |
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); |
+ test::InitializeViewsTestSuite(); |
} |
void Shutdown() override { |
- ui::ResourceBundle::CleanupSharedInstance(); |
+ test::ShutdownViewsTestSuite(); |
base::TestSuite::Shutdown(); |
} |
@@ -41,6 +30,6 @@ int main(int argc, char** argv) { |
ViewTestSuite test_suite(argc, argv); |
return base::LaunchUnitTests( |
- argc, argv, base::Bind(&ViewTestSuite::Run, |
- base::Unretained(&test_suite))); |
+ argc, argv, |
+ base::Bind(&ViewTestSuite::Run, base::Unretained(&test_suite))); |
} |