Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

ui/base/test/run_all_unittests.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "build/build_config.h"
@@ skipping 50 matching lines @@
   gfx::RegisterPathProvider();
 
   base::FilePath exe_path;
   PathService::Get(base::DIR_EXE, &exe_path);
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   // On Mac, a test Framework bundle is created that links locale.pak and
   // 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
   // locale.pak get populated by later build steps. To avoid clobbering them,
   // load the test .pak files directly.
   ui::ResourceBundle::InitSharedInstanceWithPakPath(
       exe_path.AppendASCII("ui_test.pak"));
 
   // ui_unittests can't depend on the locales folder which Chrome will make
   // later, so use the path created by ui_test_pak.
@@ skipping 13 matching lines @@
 }  // namespace
 
 int main(int argc, char** argv) {
   UIBaseTestSuite test_suite(argc, argv);
 
   return base::LaunchUnitTests(argc,
                                argv,
                                base::Bind(&UIBaseTestSuite::Run,
                                           base::Unretained(&test_suite)));
 }