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

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc

Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc
index 3173a88b87948eae8848df9f1aaf151379251a4a..440014ffb64b23eed24cff625ce6b3b5b4b57a68 100644
--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc
@@ -6,11 +6,13 @@
 
 #include <string>
 
+#include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 #include "chromeos/ime/input_method_descriptor.h"
+#include "chromeos/system/statistics_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chromeos::input_method::InputMethodDescriptor;
@@ -107,6 +109,12 @@ TEST_F(CrosLanguageOptionsHandlerTest, GetInputMethodList) {
 }
 
 TEST_F(CrosLanguageOptionsHandlerTest, GetUILanguageList) {
+  // Load statistics engine
+  base::MessageLoop tmp_loop(base::MessageLoop::TYPE_DEFAULT);
+  chromeos::system::StatisticsProvider::GetInstance()
+      ->StartLoadingMachineStatistics(tmp_loop.message_loop_proxy(), false);
+  tmp_loop.RunUntilIdle();
+
   InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
   scoped_ptr<base::ListValue> list(
       chromeos::options::CrosLanguageOptionsHandler::GetUILanguageList(