Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

components/test/run_all_unittests.cc

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
@@ skipping 58 matching lines @@
 #error Unknown branding
 #endif
 
     base::mac::SetOverrideFrameworkBundlePath(path);
 #endif
 
     ui::RegisterPathProvider();
 
     // TODO(tfarina): This should be changed to InitSharedInstanceWithPakFile()
     // so we can load our pak file instead of chrome.pak. crbug.com/348563
-    ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+    ui::ResourceBundle::InitSharedInstanceWithLocale(
+        "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
     base::FilePath resources_pack_path;
     PathService::Get(base::DIR_MODULE, &resources_pack_path);
     ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
         resources_pack_path.AppendASCII("resources.pak"),
         ui::SCALE_FACTOR_NONE);
   }
 
   virtual void Shutdown() OVERRIDE {
     ui::ResourceBundle::CleanupSharedInstance();
 
@@ skipping 34 matching lines @@
   // The listener will set up common test environment for all components unit
   // tests.
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new ComponentsUnitTestEventListener());
 
   return base::LaunchUnitTests(
       argc, argv, base::Bind(&base::TestSuite::Run,
                              base::Unretained(&test_suite)));
 }