| 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 "ui/aura/test/test_suite.h" | 5 #include "ui/aura/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.h" |
| 12 #include "ui/gfx/gfx_paths.h" | 13 #include "ui/gfx/gfx_paths.h" |
| 13 #include "ui/gfx/gl/gl_implementation.h" | 14 #include "ui/gfx/test/gfx_test_utils.h" |
| 14 | 15 |
| 15 namespace aura { | 16 namespace aura { |
| 16 namespace test { | 17 namespace test { |
| 17 | 18 |
| 18 AuraTestSuite::AuraTestSuite(int argc, char** argv) | 19 AuraTestSuite::AuraTestSuite(int argc, char** argv) |
| 19 : TestSuite(argc, argv) {} | 20 : TestSuite(argc, argv) {} |
| 20 | 21 |
| 21 void AuraTestSuite::Initialize() { | 22 void AuraTestSuite::Initialize() { |
| 22 #if defined(OS_LINUX) | |
| 23 gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); | |
| 24 #endif | |
| 25 base::TestSuite::Initialize(); | 23 base::TestSuite::Initialize(); |
| 26 | 24 |
| 27 gfx::RegisterPathProvider(); | 25 gfx::RegisterPathProvider(); |
| 28 ui::RegisterPathProvider(); | 26 ui::RegisterPathProvider(); |
| 29 | 27 |
| 30 // Force unittests to run using en-US so if we test against string | 28 // Force unittests to run using en-US so if we test against string |
| 31 // output, it'll pass regardless of the system language. | 29 // output, it'll pass regardless of the system language. |
| 32 ui::ResourceBundle::InitSharedInstance("en-US"); | 30 ui::ResourceBundle::InitSharedInstance("en-US"); |
| 31 |
| 32 // Use a mock compositor that noops draws. |
| 33 ui::gfx_test_utils::SetupTestCompositor(); |
| 33 } | 34 } |
| 34 | 35 |
| 35 void AuraTestSuite::Shutdown() { | 36 void AuraTestSuite::Shutdown() { |
| 36 ui::ResourceBundle::CleanupSharedInstance(); | 37 ui::ResourceBundle::CleanupSharedInstance(); |
| 37 | 38 |
| 38 base::TestSuite::Shutdown(); | 39 base::TestSuite::Shutdown(); |
| 39 } | 40 } |
| 40 | 41 |
| 41 } // namespace test | 42 } // namespace test |
| 42 } // namespace aura | 43 } // namespace aura |
| OLD | NEW |