Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Unified Diff: ui/base/l10n/time_format_unittest.cc

Issue 152543005: Introduce a mock ui_unittests Framework for loading resources. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac official builder, and missing dependency (thanks GTK). Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/base/strings/ui_strings.gyp » ('j') | ui/ui_unittests.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/l10n/time_format_unittest.cc
diff --git a/ui/base/l10n/time_format_unittest.cc b/ui/base/l10n/time_format_unittest.cc
index 69f8b4e94ac10b7e2df683c4b97746688f0126fa..9a237b19e1f2334c3863e5b7aeec7d21e2db8ce0 100644
--- a/ui/base/l10n/time_format_unittest.cc
+++ b/ui/base/l10n/time_format_unittest.cc
@@ -74,15 +74,6 @@ class TimeFormatTest : public ::testing::Test {
{}
protected:
- static void SetUpTestCase() {
- LoadLocale(ui::ResourceBundle::GetSharedInstance()
- .GetLocaleFilePath("en-US", true));
- }
-
- static void TearDownTestCase() {
- LoadLocale(base::FilePath());
- }
-
void TestStrings() {
// Test English strings (simple, singular).
EXPECT_EQ(ASCIIToUTF16("1 sec"), TimeFormat::Simple(
@@ -229,12 +220,6 @@ class TimeFormatTest : public ::testing::Test {
TimeDelta delta_1d12h_;
TimeDelta delta_2d_;
TimeDelta delta_2d1h_;
-
- private:
- static void LoadLocale(const base::FilePath& file_path) {
- ui::ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(file_path);
- ui::ResourceBundle::GetSharedInstance().ReloadLocaleResources("en-US");
- }
};
TEST_F(TimeFormatTest, SimpleAndDetailedRounding) {
« no previous file with comments | « no previous file | ui/base/strings/ui_strings.gyp » ('j') | ui/ui_unittests.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698