Merge 32345 - Parse messages.json in ExtensionUnpacker (like we do for manife...

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
===================================================================
--- chrome/common/extensions/extension.cc	(revision 35541)
+++ chrome/common/extensions/extension.cc	(working copy)
@@ -1158,6 +1158,14 @@
     }
   }
 
+  if (source.HasKey(keys::kDefaultLocale)) {
+    if (!source.GetString(keys::kDefaultLocale, &default_locale_) ||
+        default_locale_.empty()) {
+      *error = errors::kInvalidDefaultLocale;
+      return false;
+    }
+  }
+
   // Chrome URL overrides (optional)
   if (source.HasKey(keys::kChromeURLOverrides)) {
     DictionaryValue* overrides;