Supporting multiple keyboard layouts.

chrome/browser/chromeos/input_method/input_method_manager_impl_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_manager_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 62 matching lines @@
     xkeyboard_ = new MockXKeyboard;
     manager_->SetXKeyboardForTesting(xkeyboard_);
 
     ime_list_.clear();
 
     ComponentExtensionIME ext1;
     ext1.id = "ext1_id";
     ext1.description = "ext1_description";
     ext1.path = base::FilePath("ext1_file_path");
 
-    IBusComponent::EngineDescription ext1_engine1;
+    ComponentExtensionEngine ext1_engine1;
     ext1_engine1.engine_id = "ext1_engine1_engine_id";
     ext1_engine1.display_name = "ext1_engine_1_display_name";
     ext1_engine1.language_code = "en";
-    ext1_engine1.layout = "us";
+    ext1_engine1.layouts.push_back("us");
     ext1.engines.push_back(ext1_engine1);
 
     ime_list_.push_back(ext1);
 
     ComponentExtensionIME ext2;
     ext2.id = "ext2_id";
     ext2.description = "ext2_description";
     ext2.path = base::FilePath("ext2_file_path");
 
-    IBusComponent::EngineDescription ext2_engine1;
+    ComponentExtensionEngine ext2_engine1;
     ext2_engine1.engine_id = "ext2_engine1_engine_id";
     ext2_engine1.display_name = "ext2_engine_1_display_name";
     ext2_engine1.language_code = "en";
-    ext2_engine1.layout = "us";
+    ext2_engine1.layouts.push_back("us");
     ext2.engines.push_back(ext2_engine1);
 
     ime_list_.push_back(ext2);
   }
 
   virtual void TearDown() OVERRIDE {
     delegate_ = NULL;
     controller_ = NULL;
     candidate_window_controller_ = NULL;
     xkeyboard_ = NULL;
@@ skipping 1085 matching lines @@
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(1, controller_->change_input_method_count_);
   EXPECT_EQ(ext_id1, controller_->change_input_method_id_);
   manager_->ChangeInputMethod(ext_id2);
   EXPECT_EQ(2, controller_->change_input_method_count_);
   EXPECT_EQ(ext_id2, controller_->change_input_method_id_);
 }
 
 }  // namespace input_method
 }  // namespace chromeos