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

chrome/browser/chromeos/customization_document.h

Index: chrome/browser/chromeos/customization_document.h
diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
index 09b0b56776997529c118ff5bdded7e9047b360f1..091d7fa5c60330a7de7a118b7d37344b5c72e98e 100644
--- a/chrome/browser/chromeos/customization_document.h
+++ b/chrome/browser/chromeos/customization_document.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 
 #include <string>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
@@ -27,6 +28,11 @@ namespace net {
 class URLFetcher;
 }
 
+// This test is in global namespace so it must be declared here.
+class CrosLanguageOptionsHandlerTest_GetUILanguageListMulti_Test;

[Nikita (slow), 2014/01/31 15:47:20]

As discussed, these should be removed.

You can just add CrosLanguageOptionsHandlerTest base class as a friend class and
access private methods from test cases via a method in that base class.

[Alexander Alekseev, 2014/01/31 17:21:00]

Done.

+class CrosLanguageOptionsHandlerTest_DISABLED_GetUILanguageListMulti_Test;
+class CrosLanguageOptionsHandlerTest_FLAKY_GetUILanguageListMulti_Test;
+
 namespace chromeos {
 
 namespace system {
@@ -76,7 +82,15 @@ class StartupCustomizationDocument : public CustomizationDocument {
 
   // These methods can be called even if !IsReady(), in this case VPD values
   // will be returned.
+  //
+  // Raw value of "initial_locale" like initial_locale="en-US,sv,da,fi,no" .
   const std::string& initial_locale() const { return initial_locale_; }
+
+  // Vector of individual locale values.
+  const std::vector<std::string>& configured_locales() const;
+
+  // Default locale value (first value in initial_locale list).
+  const std::string& initial_locale_default() const;
   const std::string& initial_timezone() const { return initial_timezone_; }
   const std::string& keyboard_layout() const { return keyboard_layout_; }
 
@@ -84,6 +98,9 @@ class StartupCustomizationDocument : public CustomizationDocument {
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, VPD);
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, BadManifest);
+  FRIEND_TEST_ALL_PREFIXES(ServicesCustomizationDocumentTest, MultiLanguage);
+  FRIEND_TEST_ALL_PREFIXES(::CrosLanguageOptionsHandlerTest,
+                           GetUILanguageListMulti);
   friend struct DefaultSingletonTraits<StartupCustomizationDocument>;
 
   // C-tor for singleton construction.
@@ -101,6 +118,7 @@ class StartupCustomizationDocument : public CustomizationDocument {
   void InitFromMachineStatistic(const char* attr, std::string* value);
 
   std::string initial_locale_;
+  std::vector<std::string> configured_locales_;
   std::string initial_timezone_;
   std::string keyboard_layout_;
   std::string registration_url_;
@@ -138,6 +156,7 @@ class ServicesCustomizationDocument : public CustomizationDocument,
  private:
   FRIEND_TEST_ALL_PREFIXES(ServicesCustomizationDocumentTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(ServicesCustomizationDocumentTest, BadManifest);
+  FRIEND_TEST_ALL_PREFIXES(ServicesCustomizationDocumentTest, MultiLanguage);
   friend struct DefaultSingletonTraits<ServicesCustomizationDocument>;
 
   // C-tor for singleton construction.