Move default_locale out of Extension class

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index cf529d85845b5e939a9b61364522dc565b9ee7b5..c744ba5e4ce1a9a83fc7d851a12328eb1d86acc8 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -1922,7 +1922,6 @@ bool Extension::LoadSharedFeatures(
       !LoadNaClModules(error) ||
       !LoadSandboxedPages(error) ||
       !LoadRequirements(error) ||
-      !LoadDefaultLocale(error) ||
       !LoadOfflineEnabled(error) ||
       // LoadBackgroundScripts() must be called before LoadBackgroundPage().
       !LoadBackgroundScripts(error) ||
@@ -2268,17 +2267,6 @@ bool Extension::LoadRequirements(string16* error) {
   return true;
 }
 
-bool Extension::LoadDefaultLocale(string16* error) {
-  if (!manifest_->HasKey(keys::kDefaultLocale))
-    return true;
-  if (!manifest_->GetString(keys::kDefaultLocale, &default_locale_) ||
-      !l10n_util::IsValidLocaleSyntax(default_locale_)) {
-    *error = ASCIIToUTF16(errors::kInvalidDefaultLocale);
-    return false;
-  }
-  return true;
-}
-
 bool Extension::LoadOfflineEnabled(string16* error) {
   // Defaults to false, except for platform apps which are offline by default.
   if (!manifest_->HasKey(keys::kOfflineEnabled)) {