Support comma separated hardware keyboard layout.

chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc

 // Copyright 2013 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 <algorithm>
 
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
@@ skipping 107 matching lines @@
 // mode_indicator_delegate_view.cc.
 const int kInnerSize = 43;
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(ModeIndicatorBrowserTest, Bounds) {
   InitializeIMF();
 
   InputMethodManager* imm = InputMethodManager::Get();
   ASSERT_TRUE(imm);
 
+  std::vector<std::string> keyboard_layouts;
+  keyboard_layouts.push_back("xkb:fr::fra");
+
   // Add keyboard layouts to enable the mode indicator.
-  imm->EnableLoginLayouts("fr", "xkb:fr::fra");
+  imm->EnableLoginLayouts("fr", keyboard_layouts);
   ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
 
   chromeos::IBusPanelCandidateWindowHandlerInterface* candidate_window =
       chromeos::IMEBridge::Get()->GetCandidateWindowHandler();
   candidate_window->FocusStateChanged(true);
 
   // Check if the size of the mode indicator is expected.
   gfx::Rect cursor1_bounds(100, 100, 1, 20);
   gfx::Rect mi1_bounds;
   {
@@ skipping 42 matching lines @@
     EXPECT_LT(mi3_bounds.bottom(), screen_bounds.bottom());
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ModeIndicatorBrowserTest, NumOfWidgets) {
   InitializeIMF();
 
   InputMethodManager* imm = InputMethodManager::Get();
   ASSERT_TRUE(imm);
 
+  std::vector<std::string> keyboard_layouts;
+  keyboard_layouts.push_back("xkb:fr::fra");
+
   // Add keyboard layouts to enable the mode indicator.
-  imm->EnableLoginLayouts("fr", "xkb:fr::fra");
+  imm->EnableLoginLayouts("fr", keyboard_layouts);
   ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
 
   chromeos::IBusPanelCandidateWindowHandlerInterface* candidate_window =
       chromeos::IMEBridge::Get()->GetCandidateWindowHandler();
   candidate_window->FocusStateChanged(true);
 
   {
     ScopedModeIndicatorObserverForTesting observer;
 
     EXPECT_TRUE(imm->SwitchToNextInputMethod());
     EXPECT_EQ(1UL, observer.max_widget_list_size());
     const views::Widget* widget1 = observer.widget_list()[0];
 
     EXPECT_TRUE(imm->SwitchToNextInputMethod());
     EXPECT_EQ(2UL, observer.max_widget_list_size());
 
     // When a new mode indicator is displayed, the previous one should be
     // closed.
     content::RunAllPendingInMessageLoop();
     EXPECT_EQ(1UL, observer.widget_list_size());
     const views::Widget* widget2 = observer.widget_list()[0];
     EXPECT_NE(widget1, widget2);
   }
 }
 }  // namespace input_method
 }  // namespace chromeos