Fix CHECK failure in l10n_util::IsLocaleAvailable().

ui/base/l10n/l10n_util.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 "ui/base/l10n/l10n_util.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <string>
@@ skipping 228 matching lines @@
     return false;
 
   // IsLocalePartiallyPopulated() can be called here for an early return w/o
   // checking the resource availability below. It'd help when Chrome is run
   // under a system locale Chrome is not localized to (e.g.Farsi on Linux),
   // but it'd slow down the start up time a little bit for locales Chrome is
   // localized to. So, we don't call it here.
   if (!l10n_util::IsLocaleSupportedByOS(locale))
     return false;
 
+  // If the ResourceBundle is not yet initialized, return false to avoid the
+  // CHECK failure in ResourceBundle::GetSharedInstance().
+  if (!ResourceBundle::HasSharedInstance())
+    return false;

[jungshik at Google, 2013/04/16 20:04:55]

With this, in https://codereview.chromium.org/13825003/ , we'll always fall back
to en-US

I wonder if we can make LocaleDataPakExists() static
in chromium/src/ui/base/resource/resource_bundle.cc

[hshi1, 2013/04/16 20:36:39]

It seems very difficult to make LocaleDataPakExists() static because it calls
GetLocaleFilePath() which depends on the class member |delegate_| to function
properly.

On 2013/04/16 20:04:55, Jungshik Shin wrote:

+
   return ResourceBundle::GetSharedInstance().LocaleDataPakExists(locale);
 }
 
 bool CheckAndResolveLocale(const std::string& locale,
                            std::string* resolved_locale) {
   if (IsLocaleAvailable(locale)) {
     *resolved_locale = locale;
     return true;
   }
 
@@ skipping 587 matching lines @@
 }
 
 int GetLocalizedContentsWidthInPixels(int pixel_resource_id) {
   int width = 0;
   base::StringToInt(l10n_util::GetStringUTF8(pixel_resource_id), &width);
   DCHECK_GT(width, 0);
   return width;
 }
 
 }  // namespace l10n_util