Remove the flag g_use_wrapped_extension_keyboard_layouts.

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/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 115 matching lines @@
 }  // 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(
-      extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:fr::fra"));
+      extension_ime_util::GetInputMethodIDByEngineID("xkb:fr::fra"));
 
   // Add keyboard layouts to enable the mode indicator.
   imm->EnableLoginLayouts("fr", keyboard_layouts);
   ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
 
   chromeos::IMECandidateWindowHandlerInterface* candidate_window =
       chromeos::IMEBridge::Get()->GetCandidateWindowHandler();
   candidate_window->FocusStateChanged(true);
 
   // Check if the size of the mode indicator is expected.
@@ skipping 47 matching lines @@
 }
 
 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(
-      extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:fr::fra"));
+      extension_ime_util::GetInputMethodIDByEngineID("xkb:fr::fra"));
 
   // Add keyboard layouts to enable the mode indicator.
   imm->EnableLoginLayouts("fr", keyboard_layouts);
   ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
 
   chromeos::IMECandidateWindowHandlerInterface* 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