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 "content/test/content_test_suite.h" | 5 #include "content/test/content_test_suite.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/browser/mock_content_browser_client.h" | 8 #include "content/browser/mock_content_browser_client.h" |
9 #include "content/public/common/content_paths.h" | 9 #include "content/public/common/content_paths.h" |
10 #include "content/public/common/url_constants.h" | 10 #include "content/public/common/url_constants.h" |
11 #include "content/test/test_content_client.h" | 11 #include "content/test/test_content_client.h" |
12 #include "content/test/test_content_client_initializer.h" | 12 #include "content/test/test_content_client_initializer.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 #include "ui/base/resource/resource_bundle.h" |
14 #include "ui/base/ui_base_paths.h" | 15 #include "ui/base/ui_base_paths.h" |
15 | 16 |
16 #if defined(OS_MACOSX) | 17 #if defined(OS_MACOSX) |
17 #include "base/mac/scoped_nsautorelease_pool.h" | 18 #include "base/mac/scoped_nsautorelease_pool.h" |
18 #endif | 19 #endif |
19 #include "ui/gfx/compositor/compositor_setup.h" | 20 #include "ui/gfx/compositor/compositor_setup.h" |
20 | 21 |
21 | 22 |
22 namespace { | 23 namespace { |
23 | 24 |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 | 65 |
65 content::RegisterPathProvider(); | 66 content::RegisterPathProvider(); |
66 ui::RegisterPathProvider(); | 67 ui::RegisterPathProvider(); |
67 | 68 |
68 // Mock out the compositor on platforms that use it. | 69 // Mock out the compositor on platforms that use it. |
69 ui::SetupTestCompositor(); | 70 ui::SetupTestCompositor(); |
70 | 71 |
71 testing::TestEventListeners& listeners = | 72 testing::TestEventListeners& listeners = |
72 testing::UnitTest::GetInstance()->listeners(); | 73 testing::UnitTest::GetInstance()->listeners(); |
73 listeners.Append(new TestInitializationListener); | 74 listeners.Append(new TestInitializationListener); |
| 75 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US"); |
74 } | 76 } |
75 | 77 |
| 78 void ContentTestSuite::Shutdown() { |
| 79 ui::ResourceBundle::CleanupSharedInstance(); |
| 80 base::TestSuite::Shutdown(); |
| 81 } |
OLD | NEW |