OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/test/base/chrome_unit_test_suite.h" | 5 #include "chrome/test/base/chrome_unit_test_suite.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/message_loop/message_loop.h" |
8 #include "base/path_service.h" | 9 #include "base/path_service.h" |
9 #include "base/process/process_handle.h" | 10 #include "base/process/process_handle.h" |
10 #include "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "chrome/browser/chrome_content_browser_client.h" | 12 #include "chrome/browser/chrome_content_browser_client.h" |
12 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 13 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
13 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h" | 14 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h" |
14 #include "chrome/common/chrome_content_client.h" | 15 #include "chrome/common/chrome_content_client.h" |
15 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
16 #include "chrome/test/base/testing_browser_process.h" | 17 #include "chrome/test/base/testing_browser_process.h" |
17 #include "chrome/utility/chrome_content_utility_client.h" | 18 #include "chrome/utility/chrome_content_utility_client.h" |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 void ChromeUnitTestSuite::InitializeResourceBundle() { | 159 void ChromeUnitTestSuite::InitializeResourceBundle() { |
159 // Force unittests to run using en-US so if we test against string | 160 // Force unittests to run using en-US so if we test against string |
160 // output, it'll pass regardless of the system language. | 161 // output, it'll pass regardless of the system language. |
161 ui::ResourceBundle::InitSharedInstanceWithLocale( | 162 ui::ResourceBundle::InitSharedInstanceWithLocale( |
162 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); | 163 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); |
163 base::FilePath resources_pack_path; | 164 base::FilePath resources_pack_path; |
164 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); | 165 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); |
165 ResourceBundle::GetSharedInstance().AddDataPackFromPath( | 166 ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
166 resources_pack_path, ui::SCALE_FACTOR_NONE); | 167 resources_pack_path, ui::SCALE_FACTOR_NONE); |
167 } | 168 } |
OLD | NEW |