content: Modfiy ResourceBundle and content_shell to run with alternative pak files.

BUG=111326
R=jam
TBR=sky,tony,ajwong,ananta

Review URL: http://codereview.chromium.org/9232060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119566 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 10 insertions, 9 deletions

diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 35ee2df..4b0f0eb 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -82,7 +82,7 @@ int main(int argc, char** argv) {
 
   ui::RegisterPathProvider();
   icu_util::Initialize();
-  ResourceBundle::InitSharedInstance("en-US");
+  ResourceBundle::InitSharedInstanceWithLocale("en-US");
 
   // Create the message-loop here before creating the root window.
   MessageLoop message_loop(MessageLoop::TYPE_UI);
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc
index 3d6c1b2..a9c9cb9 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -28,7 +28,7 @@ void AuraTestSuite::Initialize() {
 
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
-  ui::ResourceBundle::InitSharedInstance("en-US");
+  ui::ResourceBundle::InitSharedInstanceWithLocale("en-US");
   ui::CompositorTestSupport::Initialize();
 
   ui::SetupTestCompositor();
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 596bbe1..c557dfb 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -49,7 +49,7 @@ const SkColor ResourceBundle::toolbar_separator_color =
      SkColorSetRGB(182, 186, 192);
 
 // static
-std::string ResourceBundle::InitSharedInstance(
+std::string ResourceBundle::InitSharedInstanceWithLocale(
     const std::string& pref_locale) {
   DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
   g_shared_instance_ = new ResourceBundle();
@@ -59,7 +59,7 @@ std::string ResourceBundle::InitSharedInstance(
 }
 
 // static
-void ResourceBundle::InitSharedInstanceForTest(const FilePath& path) {
+void ResourceBundle::InitSharedInstanceWithPakFile(const FilePath& path) {
   DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
   g_shared_instance_ = new ResourceBundle();
 
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index fd201e9..cb966c8 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -80,10 +80,11 @@ class UI_EXPORT ResourceBundle {
   // selected.
   // NOTE: Mac ignores this and always loads up resources for the language
   // defined by the Cocoa UI (ie-NSBundle does the langange work).
-  static std::string InitSharedInstance(const std::string& pref_locale);
+  static std::string InitSharedInstanceWithLocale(
+      const std::string& pref_locale);
 
   // Initialize the ResourceBundle using given data pack path for testing.
-  static void InitSharedInstanceForTest(const FilePath& path);
+  static void InitSharedInstanceWithPakFile(const FilePath& path);
 
   // Load a .pak file.  Returns NULL if we fail to load |path|.  The caller
   // is responsible for deleting up this pointer.
diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test_suite.cc
index 046f694..4a26607 100644
--- a/ui/gfx/test_suite.cc
+++ b/ui/gfx/test_suite.cc
@@ -49,7 +49,7 @@ void GfxTestSuite::Initialize() {
 
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
-  ui::ResourceBundle::InitSharedInstance("en-US");
+  ui::ResourceBundle::InitSharedInstanceWithLocale("en-US");
 }
 
 void GfxTestSuite::Shutdown() {
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index de3b598..0ff6fa9 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -42,7 +42,7 @@ int main(int argc, char** argv) {
   ui::RegisterPathProvider();
   bool icu_result = icu_util::Initialize();
   CHECK(icu_result);
-  ui::ResourceBundle::InitSharedInstance("en-US");
+  ui::ResourceBundle::InitSharedInstanceWithLocale("en-US");
 
   MessageLoop main_message_loop(MessageLoop::TYPE_UI);
 
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
index 8458072..9cf79e2 100644
--- a/ui/views/run_all_unittests.cc
+++ b/ui/views/run_all_unittests.cc
@@ -18,7 +18,7 @@ class ViewTestSuite : public base::TestSuite {
     base::TestSuite::Initialize();
 
     ui::RegisterPathProvider();
-    ui::ResourceBundle::InitSharedInstance("en-US");
+    ui::ResourceBundle::InitSharedInstanceWithLocale("en-US");
 
     ui::CompositorTestSupport::Initialize();
     ui::SetupTestCompositor();