Chromium Code Reviews| Index: content/test/test_content_client.cc |
| diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc |
| index dc14eb193edf2ea51b524d4b03f33d0e5676bfd4..2da446918af40a005bd1c933e9ad08ddff53d38d 100644 |
| --- a/content/test/test_content_client.cc |
| +++ b/content/test/test_content_client.cc |
| @@ -12,11 +12,15 @@ |
| TestContentClient::TestContentClient() |
| : data_pack_(ui::SCALE_FACTOR_100P) { |
| + // content_resources.pak is not built on iOS as it is not required. Avoid |
| + // loading it for tests to avoid confusion. |
|
stuartmorgan
2012/09/13 14:40:39
Remove the second sentence.
|
| +#if !defined(OS_IOS) |
| FilePath content_resources_pack_path; |
| PathService::Get(base::DIR_MODULE, &content_resources_pack_path); |
| content_resources_pack_path = content_resources_pack_path.Append( |
| FILE_PATH_LITERAL("content_resources.pak")); |
| data_pack_.LoadFromPath(content_resources_pack_path); |
| +#endif |
| } |
| TestContentClient::~TestContentClient() { |