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

chrome/browser/chromeos/customization_document.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 
 #include <string>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 class PrefRegistrySimple;
 
 namespace base {
 class DictionaryValue;
 class FilePath;
 }
 
 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 {
 class StatisticsProvider;
 }  // system
 
 // Base class for OEM customization document classes.
 class CustomizationDocument {
  public:
   virtual ~CustomizationDocument();
@@ skipping 29 matching lines @@
  public:
   static StartupCustomizationDocument* GetInstance();
 
   std::string GetHelpPage(const std::string& locale) const;
   std::string GetEULAPage(const std::string& locale) const;
 
   const std::string& registration_url() const { return registration_url_; }
 
   // 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_; }
 
  private:
   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.
   StartupCustomizationDocument();
 
   // C-tor for test construction.
   StartupCustomizationDocument(system::StatisticsProvider* provider,
                                const std::string& manifest);
 
   virtual ~StartupCustomizationDocument();
 
   void Init(system::StatisticsProvider* provider);
 
   // If |attr| exists in machine stat, assign it to |value|.
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupCustomizationDocument);
 };
 
 // OEM services customization document class.
 // ServicesCustomizationDocument is fetched from network or local file but on
 // FILE thread therefore it may not be ready just after creation. Fetching of
@@ skipping 17 matching lines @@
   // Apply customization and save in machine options that customization was
   // applied successfully. Return true if customization was applied.
   bool ApplyCustomization();
 
   std::string GetInitialStartPage(const std::string& locale) const;
   std::string GetSupportPage(const std::string& locale) const;
 
  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.
   ServicesCustomizationDocument();
 
   // C-tor for test construction.
   explicit ServicesCustomizationDocument(const std::string& manifest);
 
   virtual ~ServicesCustomizationDocument();
 
@@ skipping 20 matching lines @@
 
   // How many times we already tried to fetch customization manifest file.
   int num_retries_;
 
   DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_