Remove the flag g_use_wrapped_extension_keyboard_layouts.

chrome/browser/chromeos/login/oobe_localization_browsertest.cc

 // Copyright 2014 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 "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 205 matching lines @@
       "    }\n"
       "  }\n"
       "  return result;\n"
       "})()\n",
       select_id);
   return checker.GetString(expression);
 }
 
 std::string TranslateXKB2Extension(const std::string& src) {
   std::string result(src);
-  if (!extension_ime_util::UseWrappedExtensionKeyboardLayouts())
-    return result;
   // Modifies the expected keyboard select control options for the new
   // extension based xkb id.
   size_t pos = 0;
   std::string repl_old = "xkb:";
   std::string repl_new =
-      extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:");
+      extension_ime_util::GetInputMethodIDByEngineID("xkb:");
   while ((pos = result.find(repl_old, pos)) != std::string::npos) {
     result.replace(pos, repl_old.length(), repl_new);
     pos += repl_new.length();
   }
   return result;
 }
 
 void OobeLocalizationTest::RunLocalizationTest(
     const std::string& initial_locale,
     const std::string& keyboard_layout,
@@ skipping 34 matching lines @@
   if (!VerifyInitialOptions(
           kKeyboardSelect,
           TranslateXKB2Extension(expected_keyboard_layout).c_str(),
           false)) {
     LOG(ERROR) << "Actual value of " << kKeyboardSelect << ":\n"
                << DumpOptions(kKeyboardSelect);
   }
 
   // Make sure we have a fallback keyboard.
   if (!VerifyOptionExists(kKeyboardSelect,
-                          extension_ime_util::GetInputMethodIDByKeyboardLayout(
+                          extension_ime_util::GetInputMethodIDByEngineID(
                               kUSLayout).c_str())) {
     LOG(ERROR) << "Actual value of " << kKeyboardSelect << ":\n"
                << DumpOptions(kKeyboardSelect);
   }
 
   // Note, that sort order is locale-specific, but is unlikely to change.
   // Especially for keyboard layouts.
   EXPECT_EQ(expected_keyboard_select, DumpOptions(kKeyboardSelect));
 
   // Shut down the display host.
@@ skipping 71 matching lines @@
                       "]");
   // Another syntetic example. Check that british keyboard is available.
   RunLocalizationTest("en-AU",
                       "xkb:us::eng",
                       "en-AU",
                       "xkb:us::eng",
                       "xkb:us::eng,[xkb:gb:extd:eng,xkb:gb:dvorak:eng]");
 }
 
 }  // namespace chromeos