diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/base/win/i18n_unittest.cc | |
parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/win/i18n_unittest.cc')
-rw-r--r-- | chromium/base/win/i18n_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/base/win/i18n_unittest.cc b/chromium/base/win/i18n_unittest.cc index 3b0b668a735..f38db247a4a 100644 --- a/chromium/base/win/i18n_unittest.cc +++ b/chromium/base/win/i18n_unittest.cc @@ -19,24 +19,24 @@ namespace i18n { // Tests that at least one user preferred UI language can be obtained. TEST(I18NTest, GetUserPreferredUILanguageList) { - std::vector<base::string16> languages; + std::vector<std::wstring> languages; EXPECT_TRUE(GetUserPreferredUILanguageList(&languages)); EXPECT_FALSE(languages.empty()); for (const auto& language : languages) { EXPECT_FALSE(language.empty()); // Ensure there's no extra trailing 0 characters. - EXPECT_EQ(language.size(), wcslen(base::as_wcstr(language))); + EXPECT_EQ(language.size(), wcslen(language.c_str())); } } // Tests that at least one thread preferred UI language can be obtained. TEST(I18NTest, GetThreadPreferredUILanguageList) { - std::vector<base::string16> languages; + std::vector<std::wstring> languages; EXPECT_TRUE(GetThreadPreferredUILanguageList(&languages)); EXPECT_FALSE(languages.empty()); for (const auto& language : languages) { EXPECT_FALSE(language.empty()); - EXPECT_EQ(language.size(), wcslen(base::as_wcstr(language))); + EXPECT_EQ(language.size(), wcslen(language.c_str())); } } |