Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

ui/base/test/run_all_unittests.cc

Index: ui/base/test/run_all_unittests.cc
diff --git a/ui/base/test/run_all_unittests.cc b/ui/base/test/run_all_unittests.cc
index bfc5f2603b9310c0fa535df0941093a98eeab092..214df985f6279d9403b171c8a07abaed31093a35 100644
--- a/ui/base/test/run_all_unittests.cc
+++ b/ui/base/test/run_all_unittests.cc
@@ -68,12 +68,14 @@ void UIBaseTestSuite::Initialize() {
   // chrome_100_percent.pak at the appropriate places to ui_test.pak.
   base::mac::SetOverrideFrameworkBundlePath(
       exe_path.AppendASCII("ui_unittests Framework.framework"));
-  ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      "en-US", NULL, u::ResourceBundle::LOAD_COMMON_RESOURCES);

[tony, 2014/08/12 16:32:50]

Typo: Missing i

[tfarina, 2014/08/13 05:11:43]

doing patches at 1:00AM, that is what happens ;)

fixed.

 
 #elif defined(OS_IOS) || defined(OS_ANDROID)
   // On iOS, the ui_unittests binary is itself a mini bundle, with resources
   // built in. On Android, ui_unittests_apk provides the necessary framework.
-  ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      "en-US", NULL, u::ResourceBundle::LOAD_COMMON_RESOURCES);

[tony, 2014/08/12 16:32:50]

Same here.

[tfarina, 2014/08/13 05:11:43]

Done.

 
 #else
   // On other platforms, the (hardcoded) paths for chrome_100_percent.pak and