Commit c751290a authored by Olivier Robin's avatar Olivier Robin Committed by Commit Bot

Load icudtl.dat in eg2tests app hosts.

Some base i18n functions requires the icu data.
E.g.: GetPluralStringFUTF16

Change-Id: I80b2bc0f6a7b26f5da0a4daaee7fac66217396ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2449472Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813728}
parent 0f1fa93d
...@@ -260,6 +260,7 @@ source_set("chrome_egtest_bundle_main+eg2") { ...@@ -260,6 +260,7 @@ source_set("chrome_egtest_bundle_main+eg2") {
deps = [ deps = [
"//base", "//base",
"//base:i18n",
"//ui/base", "//ui/base",
] ]
} }
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/at_exit.h" #include "base/at_exit.h"
#include "base/check.h" #include "base/check.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/i18n/icu_util.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
...@@ -49,6 +50,8 @@ class TestMain { ...@@ -49,6 +50,8 @@ class TestMain {
// CommandLine to exist. // CommandLine to exist.
base::CommandLine::Init(argc, argv); base::CommandLine::Init(argc, argv);
base::i18n::InitializeICU();
// Load pak files into the ResourceBundle. // Load pak files into the ResourceBundle.
l10n_util::OverrideLocaleWithCocoaLocale(); l10n_util::OverrideLocaleWithCocoaLocale();
const std::string loaded_locale = const std::string loaded_locale =
......
...@@ -188,6 +188,7 @@ template("chrome_ios_eg2_test") { ...@@ -188,6 +188,7 @@ template("chrome_ios_eg2_test") {
bundle_deps += [ bundle_deps += [
"//ios/chrome/app/resources", "//ios/chrome/app/resources",
"//ios/third_party/gtx:gtx+bundle", "//ios/third_party/gtx:gtx+bundle",
"//third_party/icu:icudata",
] ]
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment