| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/test/test_suite.h" | 5 #include "ash/test/test_suite.h" |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 11 #include "ui/base/ui_base_paths.h" | 11 #include "ui/base/ui_base_paths.h" |
| 12 #include "ui/gfx/compositor/test/compositor_test_support.h" | 12 #include "ui/gfx/compositor/test/compositor_test_support.h" |
| 13 #include "ui/gfx/gfx_paths.h" | 13 #include "ui/gfx/gfx_paths.h" |
| 14 | 14 |
| 15 #if defined(USE_WEBKIT_COMPOSITOR) | 15 #if defined(USE_WEBKIT_COMPOSITOR) |
| 16 #include "ui/gfx/compositor/compositor_setup.h" | 16 #include "ui/gfx/compositor/compositor_setup.h" |
| 17 #else | 17 #else |
| 18 #include "ui/gfx/test/gfx_test_utils.h" | 18 #include "ui/gfx/test/gfx_test_utils.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 namespace aura_shell { | 21 namespace ash { |
| 22 namespace test { | 22 namespace test { |
| 23 | 23 |
| 24 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) | 24 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) |
| 25 : TestSuite(argc, argv) {} | 25 : TestSuite(argc, argv) {} |
| 26 | 26 |
| 27 void AuraShellTestSuite::Initialize() { | 27 void AuraShellTestSuite::Initialize() { |
| 28 base::TestSuite::Initialize(); | 28 base::TestSuite::Initialize(); |
| 29 | 29 |
| 30 gfx::RegisterPathProvider(); | 30 gfx::RegisterPathProvider(); |
| 31 ui::RegisterPathProvider(); | 31 ui::RegisterPathProvider(); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 42 } | 42 } |
| 43 | 43 |
| 44 void AuraShellTestSuite::Shutdown() { | 44 void AuraShellTestSuite::Shutdown() { |
| 45 ui::CompositorTestSupport::Terminate(); | 45 ui::CompositorTestSupport::Terminate(); |
| 46 ui::ResourceBundle::CleanupSharedInstance(); | 46 ui::ResourceBundle::CleanupSharedInstance(); |
| 47 | 47 |
| 48 base::TestSuite::Shutdown(); | 48 base::TestSuite::Shutdown(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace test | 51 } // namespace test |
| 52 } // namespace aura_shell | 52 } // namespace ash |
| OLD | NEW |