| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 13 #include "ui/base/resource/resource_bundle.h" | 13 #include "ui/base/resource/resource_bundle.h" |
| 14 #include "ui/base/ui_base_paths.h" | 14 #include "ui/base/ui_base_paths.h" |
| 15 #include "ui/compositor/compositor_setup.h" | |
| 16 #include "ui/gfx/gfx_paths.h" | 15 #include "ui/gfx/gfx_paths.h" |
| 17 | 16 |
| 18 #if defined(OS_MACOSX) | 17 #if defined(OS_MACOSX) |
| 19 #include "ash/test/test_suite_init.h" | 18 #include "ash/test/test_suite_init.h" |
| 20 #endif | 19 #endif |
| 21 | 20 |
| 22 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| 23 #include "base/win/windows_version.h" | 22 #include "base/win/windows_version.h" |
| 24 #include "ui/base/win/atl_module.h" | 23 #include "ui/base/win/atl_module.h" |
| 25 #include "win8/test/metro_registration_helper.h" | 24 #include "win8/test/metro_registration_helper.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 48 gfx::RegisterPathProvider(); | 47 gfx::RegisterPathProvider(); |
| 49 ui::RegisterPathProvider(); | 48 ui::RegisterPathProvider(); |
| 50 | 49 |
| 51 #if defined(OS_MACOSX) | 50 #if defined(OS_MACOSX) |
| 52 ash::test::OverrideFrameworkBundle(); | 51 ash::test::OverrideFrameworkBundle(); |
| 53 #endif | 52 #endif |
| 54 | 53 |
| 55 // Force unittests to run using en-US so if we test against string | 54 // Force unittests to run using en-US so if we test against string |
| 56 // output, it'll pass regardless of the system language. | 55 // output, it'll pass regardless of the system language. |
| 57 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | 56 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 58 ui::SetupTestCompositor(); | |
| 59 } | 57 } |
| 60 | 58 |
| 61 void AuraShellTestSuite::Shutdown() { | 59 void AuraShellTestSuite::Shutdown() { |
| 62 ui::ResourceBundle::CleanupSharedInstance(); | 60 ui::ResourceBundle::CleanupSharedInstance(); |
| 63 #if defined(OS_WIN) | 61 #if defined(OS_WIN) |
| 64 com_initializer_.reset(); | 62 com_initializer_.reset(); |
| 65 #endif | 63 #endif |
| 66 base::TestSuite::Shutdown(); | 64 base::TestSuite::Shutdown(); |
| 67 } | 65 } |
| 68 | 66 |
| 69 } // namespace test | 67 } // namespace test |
| 70 } // namespace ash | 68 } // namespace ash |
| OLD | NEW |