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" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 } | 45 } |
46 #endif | 46 #endif |
47 | 47 |
48 gfx::RegisterPathProvider(); | 48 gfx::RegisterPathProvider(); |
49 ui::RegisterPathProvider(); | 49 ui::RegisterPathProvider(); |
50 | 50 |
51 // Force unittests to run using en-US so if we test against string | 51 // Force unittests to run using en-US so if we test against string |
52 // output, it'll pass regardless of the system language. | 52 // output, it'll pass regardless of the system language. |
53 ui::ResourceBundle::InitSharedInstanceWithLocale( | 53 ui::ResourceBundle::InitSharedInstanceWithLocale( |
54 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); | 54 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); |
| 55 |
| 56 base::DiscardableMemoryShmemAllocator::SetInstance( |
| 57 &discardable_memory_allocator_); |
55 } | 58 } |
56 | 59 |
57 void AuraShellTestSuite::Shutdown() { | 60 void AuraShellTestSuite::Shutdown() { |
58 ui::ResourceBundle::CleanupSharedInstance(); | 61 ui::ResourceBundle::CleanupSharedInstance(); |
59 #if defined(OS_WIN) | 62 #if defined(OS_WIN) |
60 com_initializer_.reset(); | 63 com_initializer_.reset(); |
61 #endif | 64 #endif |
62 base::TestSuite::Shutdown(); | 65 base::TestSuite::Shutdown(); |
63 } | 66 } |
64 | 67 |
65 } // namespace test | 68 } // namespace test |
66 } // namespace ash | 69 } // namespace ash |
OLD | NEW |