| 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 "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 #include "ui/base/resource/resource_bundle.h" | 12 #include "ui/base/resource/resource_bundle.h" |
| 13 #include "ui/base/ui_base_paths.h" | 13 #include "ui/base/ui_base_paths.h" |
| 14 #include "ui/gfx/gfx_paths.h" | 14 #include "ui/gfx/gfx_paths.h" |
| 15 #include "ui/gl/gl_surface.h" | 15 #include "ui/gl/gl_surface.h" |
| 16 | 16 |
| 17 #if defined(OS_CHROMEOS) |
| 18 #include "ui/keyboard/keyboard.h" |
| 19 #endif |
| 20 |
| 17 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| 18 #include "base/win/windows_version.h" | 22 #include "base/win/windows_version.h" |
| 19 #include "ui/base/win/atl_module.h" | 23 #include "ui/base/win/atl_module.h" |
| 20 #include "win8/test/metro_registration_helper.h" | 24 #include "win8/test/metro_registration_helper.h" |
| 21 #include "win8/test/test_registrar_constants.h" | 25 #include "win8/test/test_registrar_constants.h" |
| 22 #endif | 26 #endif |
| 23 | 27 |
| 24 namespace ash { | 28 namespace ash { |
| 25 namespace test { | 29 namespace test { |
| 26 | 30 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 54 | 58 |
| 55 // Force unittests to run using en-US so if we test against string | 59 // Force unittests to run using en-US so if we test against string |
| 56 // output, it'll pass regardless of the system language. | 60 // output, it'll pass regardless of the system language. |
| 57 ui::ResourceBundle::InitSharedInstanceWithLocale( | 61 ui::ResourceBundle::InitSharedInstanceWithLocale( |
| 58 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); | 62 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); |
| 59 | 63 |
| 60 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); | 64 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); |
| 61 } | 65 } |
| 62 | 66 |
| 63 void AuraShellTestSuite::Shutdown() { | 67 void AuraShellTestSuite::Shutdown() { |
| 68 #if defined(OS_CHROMEOS) |
| 69 keyboard::ResetKeyboardForTesting(); |
| 70 #endif |
| 64 ui::ResourceBundle::CleanupSharedInstance(); | 71 ui::ResourceBundle::CleanupSharedInstance(); |
| 65 #if defined(OS_WIN) | 72 #if defined(OS_WIN) |
| 66 com_initializer_.reset(); | 73 com_initializer_.reset(); |
| 67 #endif | 74 #endif |
| 68 base::TestSuite::Shutdown(); | 75 base::TestSuite::Shutdown(); |
| 69 } | 76 } |
| 70 | 77 |
| 71 } // namespace test | 78 } // namespace test |
| 72 } // namespace ash | 79 } // namespace ash |
| OLD | NEW |