Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

apps/app_shim/chrome_main_app_mode_mac.mm

 // Copyright 2013 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.
 
 // On Mac, one can't make shortcuts with command-line arguments. Instead, we
 // produce small app bundles which locate the Chromium framework and load it,
 // passing the appropriate data. This is the entry point into the framework for
 // those app bundles.
 
 #import <Cocoa/Cocoa.h>
@@ skipping 564 matching lines @@
   for (NSString* language in preferred_languages) {
     if ([supported_languages containsObject:language]) {
       preferred_localization = base::SysNSStringToUTF8(language);
       break;
     }
   }
   std::string locale = l10n_util::NormalizeLocale(
       l10n_util::GetApplicationLocale(preferred_localization));
 
   // Load localized strings.
-  ResourceBundle::InitSharedInstanceLocaleOnly(locale, NULL);
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      locale, NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
 
   // Launch the IO thread.
   base::Thread::Options io_thread_options;
   io_thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
   base::Thread *io_thread = new base::Thread("CrAppShimIO");
   io_thread->StartWithOptions(io_thread_options);
   g_io_thread = io_thread;
 
   // Find already running instances of Chrome.
   pid_t pid = -1;
@@ skipping 64 matching lines @@
     // minute.
     main_message_loop.PostTask(
         FROM_HERE,
         base::Bind(&AppShimController::Init,
                    base::Unretained(&controller)));
   }
 
   main_message_loop.Run();
   return 0;
 }