diff options
| author | tmoniuszko <tmoniuszko@opera.com> | 2015-12-01 02:45:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 10:46:24 +0000 |
| commit | 20307b827528c927cb508f8057838f92b3913899 (patch) | |
| tree | 50b9aa24ae0a9e9c226395038720a3c21609de4d /ui | |
| parent | 4bcbb121d634b0d087af5e35dcefface2b33aec2 (diff) | |
| download | chromium_src-20307b827528c927cb508f8057838f92b3913899.zip chromium_src-20307b827528c927cb508f8057838f92b3913899.tar.gz chromium_src-20307b827528c927cb508f8057838f92b3913899.tar.bz2 | |
Fix resource-related issues in views_unittests
Make sure ui_test.pak file is available for views_unittests.
Also make views_unittests independent from chrome locale pak files by replacing l10n_util::GetApplicationLocale() with base::i18n::GetConfiguredLocale() for tests. The first function needs chrome locale pak files to exist or it returns empty locale string.
BUG=
TEST=Remove all output files. Build only views_unittests. Run views_unittests.
Review URL: https://codereview.chromium.org/1464503002
Cr-Commit-Position: refs/heads/master@{#362370}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/BUILD.gn | 4 | ||||
| -rw-r--r-- | ui/views/controls/slider_unittest.cc | 4 | ||||
| -rw-r--r-- | ui/views/controls/textfield/textfield_unittest.cc | 8 | ||||
| -rw-r--r-- | ui/views/view_unittest.cc | 3 |
4 files changed, 12 insertions, 7 deletions
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index 44e854c..93a6603 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -214,6 +214,10 @@ test("views_unittests") { "//url", ] + data_deps = [ + "//ui/resources:ui_test_pak", + ] + if (is_win) { deps += [ "//third_party/iaccessible2", diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc index 601a1c2..b144cb3 100644 --- a/ui/views/controls/slider_unittest.cc +++ b/ui/views/controls/slider_unittest.cc @@ -6,12 +6,12 @@ #include <string> +#include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/events/event.h" #include "ui/events/gesture_event_details.h" #include "ui/events/test/event_generator.h" @@ -192,7 +192,7 @@ void SliderTest::SetUp() { view->SetSize(size); max_x_ = size.width() - 1; max_y_ = size.height() - 1; - default_locale_ = l10n_util::GetApplicationLocale(""); + default_locale_ = base::i18n::GetConfiguredLocale(); views::Widget::InitParams init_params(CreateParams( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS)); diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc index 5e6e121..fecc190 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(); diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 853b050..163a9f7 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -4,6 +4,7 @@ #include <map> +#include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" #include "base/rand_util.h" #include "base/strings/string_util.h" @@ -183,7 +184,7 @@ void ScrambleTree(views::View* view) { class ScopedRTL { public: ScopedRTL() { - locale_ = l10n_util::GetApplicationLocale(std::string()); + locale_ = base::i18n::GetConfiguredLocale(); base::i18n::SetICUDefaultLocale("he"); } ~ScopedRTL() { base::i18n::SetICUDefaultLocale(locale_); } |