| 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 "ui/test/test_suite.h" | 5 #include "ui/test/test_suite.h" |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 PathService::Override(ui::DIR_LOCALES, pak_dir); | 52 PathService::Override(ui::DIR_LOCALES, pak_dir); |
| 53 #endif // defined(OS_ANDROID) | 53 #endif // defined(OS_ANDROID) |
| 54 #endif // defined(OS_MACOSX) | 54 #endif // defined(OS_MACOSX) |
| 55 | 55 |
| 56 // Force unittests to run using en-US so if we test against string | 56 // Force unittests to run using en-US so if we test against string |
| 57 // output, it'll pass regardless of the system language. | 57 // output, it'll pass regardless of the system language. |
| 58 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | 58 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 59 | 59 |
| 60 #if !defined(OS_MACOSX) && defined(OS_POSIX) | 60 #if !defined(OS_MACOSX) && defined(OS_POSIX) |
| 61 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( | 61 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
| 62 pak_dir.AppendASCII("ui_resources_100_percent.pak"), | 62 pak_dir.AppendASCII("chrome_100_percent.pak"), |
| 63 ui::SCALE_FACTOR_100P); | 63 ui::SCALE_FACTOR_100P); |
| 64 #endif | 64 #endif |
| 65 } | 65 } |
| 66 | 66 |
| 67 void UITestSuite::Shutdown() { | 67 void UITestSuite::Shutdown() { |
| 68 ui::ResourceBundle::CleanupSharedInstance(); | 68 ui::ResourceBundle::CleanupSharedInstance(); |
| 69 | 69 |
| 70 #if defined(OS_MACOSX) | 70 #if defined(OS_MACOSX) |
| 71 base::mac::SetOverrideFrameworkBundle(NULL); | 71 base::mac::SetOverrideFrameworkBundle(NULL); |
| 72 #endif | 72 #endif |
| 73 base::TestSuite::Shutdown(); | 73 base::TestSuite::Shutdown(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 } // namespace test | 76 } // namespace test |
| 77 } // namespace ui | 77 } // namespace ui |
| OLD | NEW |