Expand VPD initial_locale to a list of locales. Use the expanded VPD initial_locale on the OOBE.

chrome/browser/chromeos/customization_document.cc

Index: chrome/browser/chromeos/customization_document.cc
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc
index f61cc8655bc738e42d2419573a8f2014c579891f..fbff1b6944be5eec368c26c131ca6214b31beca6 100644
--- a/chrome/browser/chromeos/customization_document.cc
+++ b/chrome/browser/chromeos/customization_document.cc
@@ -12,6 +12,7 @@
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ -212,6 +213,22 @@ void StartupCustomizationDocument::Init(
                                            &initial_timezone_);
   statistics_provider->GetMachineStatistic(kKeyboardLayoutAttr,
                                            &keyboard_layout_);
+  configured_locales_.resize(0);
+  base::SplitString(initial_locale_, ',', &configured_locales_);
+  // Let's always have configured_locales_.front() a valid entry.
+  if (configured_locales_.size() == 0)
+    configured_locales_.push_back(std::string());

[Nikita (slow), 2014/01/30 13:23:28]

I think this breaks assumptions.
If initial_locale VPD value is empty then configured_locales() getter should
return empty vector. One could even check its size.

Caller of configured_locales() should not check its content for valid values.

Just make initial_locale_default() return empty string in that case.

Another thing should always happen: if initial_locale_default() is empty string
(i.e. empty VPD values + customization manifest missing), locale will be en-US.
I think this already is the case.

[Alexander Alekseev, 2014/01/31 12:46:54]

In offline discussion we've decided to leave this as is.

On 2014/01/30 13:23:28, Nikita Kostylev wrote:

+}
+
+const std::vector<std::string>&
+StartupCustomizationDocument::configured_locales() const {
+  return configured_locales_;
+}
+
+const std::string& StartupCustomizationDocument::initial_locale_default()
+    const {
+  DCHECK(configured_locales_.size() > 0);
+  return configured_locales_.front();
 }
 
 std::string StartupCustomizationDocument::GetHelpPage(