Supporting multiple keyboard layouts.

chrome/browser/chromeos/input_method/input_method_util_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 34 matching lines @@
       : util_(&delegate_, whitelist_.GetSupportedInputMethods()) {
     delegate_.set_get_localized_string_callback(
         base::Bind(&l10n_util::GetStringUTF16));
     delegate_.set_get_display_language_name_callback(
         base::Bind(&InputMethodUtilTest::GetDisplayLanguageName));
   }
 
   InputMethodDescriptor GetDesc(const std::string& id,
                                 const std::string& raw_layout,
                                 const std::string& language_code) {
+    std::vector<std::string> layouts;
+    layouts.push_back(raw_layout);
     return InputMethodDescriptor(id,
                                  "",
-                                 raw_layout,
+                                 layouts,
                                  language_code,
                                  "");  // options page url
   }
 
   static string16 GetDisplayLanguageName(const std::string& language_code) {
     return l10n_util::GetDisplayNameForLocale(language_code, "en", true);
   }
 
   FakeInputMethodDelegate delegate_;
   InputMethodWhitelist whitelist_;
@@ skipping 269 matching lines @@
   EXPECT_EQ("", util_.GetInputMethodDisplayNameFromId("nonexistent"));
 }
 
 TEST_F(InputMethodUtilTest, TestGetInputMethodDescriptorFromId) {
   EXPECT_EQ(NULL, util_.GetInputMethodDescriptorFromId("non_existent"));
 
   const InputMethodDescriptor* descriptor =
       util_.GetInputMethodDescriptorFromId("pinyin");
   ASSERT_TRUE(NULL != descriptor);  // ASSERT_NE doesn't compile.
   EXPECT_EQ("pinyin", descriptor->id());
-  EXPECT_EQ("us", descriptor->keyboard_layout());
+  EXPECT_EQ("us", descriptor->GetPreferredKeyboardLayout());
   // This used to be "zh" but now we have "zh-CN" in input_methods.h,
   // hence this should be zh-CN now.
   EXPECT_EQ("zh-CN", descriptor->language_code());
 }
 
 TEST_F(InputMethodUtilTest, TestGetInputMethodIdsForLanguageCode) {
   std::multimap<std::string, std::string> language_code_to_ids_map;
   language_code_to_ids_map.insert(std::make_pair("ja", "mozc"));
   language_code_to_ids_map.insert(std::make_pair("ja", "mozc-jp"));
   language_code_to_ids_map.insert(std::make_pair("ja", "xkb:jp:jpn"));
@@ skipping 150 matching lines @@
     EXPECT_FALSE(display_name.empty())
         << "Invalid language code " << language_code;
     // On error, GetDisplayNameForLocale() returns the |language_code| as-is.
     EXPECT_NE(language_code, UTF16ToUTF8(display_name))
         << "Invalid language code " << language_code;
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos