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

Unified Diff: ui/views/controls/textfield/textfield_unittest.cc

Issue 1464503002: Fix resource-related issues in views_unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make views_unittests independent from locale pak files Created 5 years, 1 month 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 | « ui/views/controls/slider_unittest.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/textfield_unittest.cc
diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
index 5e6e121cd973f401d32078b897139f2b02a37671..fecc19060714d0fb8a75f054d2651dc836afd167 100644
--- a/ui/views/controls/textfield/textfield_unittest.cc
+++ b/ui/views/controls/textfield/textfield_unittest.cc
@@ -9,6 +9,7 @@
#include <vector>
#include "base/command_line.h"
+#include "base/i18n/rtl.h"
#include "base/pickle.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
@@ -20,7 +21,6 @@
#include "ui/base/ime/input_method_delegate.h"
#include "ui/base/ime/input_method_factory.h"
#include "ui/base/ime/text_input_client.h"
-#include "ui/base/l10n/l10n_util.h"
#include "ui/base/ui_base_switches.h"
#include "ui/base/ui_base_switches_util.h"
#include "ui/events/event.h"
@@ -1896,7 +1896,7 @@ TEST_F(TextfieldTest, TextCursorDisplayTest) {
}
TEST_F(TextfieldTest, TextCursorDisplayInRTLTest) {
- std::string locale = l10n_util::GetApplicationLocale("");
+ std::string locale = base::i18n::GetConfiguredLocale();
base::i18n::SetICUDefaultLocale("he");
InitTextfield();
@@ -2043,7 +2043,7 @@ TEST_F(TextfieldTest, HitOutsideTextAreaTest) {
}
TEST_F(TextfieldTest, HitOutsideTextAreaInRTLTest) {
- std::string locale = l10n_util::GetApplicationLocale("");
+ std::string locale = base::i18n::GetConfiguredLocale();
base::i18n::SetICUDefaultLocale("he");
InitTextfield();
@@ -2106,7 +2106,7 @@ TEST_F(TextfieldTest, OverflowTest) {
}
TEST_F(TextfieldTest, OverflowInRTLTest) {
- std::string locale = l10n_util::GetApplicationLocale("");
+ std::string locale = base::i18n::GetConfiguredLocale();
base::i18n::SetICUDefaultLocale("he");
InitTextfield();
« no previous file with comments | « ui/views/controls/slider_unittest.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698