Remove the flag g_use_wrapped_extension_keyboard_layouts.

chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

Index: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
index 9053827faa058e35864fc0fd3070f08a83a213e6..4db6df67f2fb817afcb986d92bbc862d023d2122 100644
--- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
@@ -14,6 +14,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
+#include "chromeos/ime/extension_ime_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
@@ -32,61 +33,56 @@ struct WhitelistedComponentExtensionIME {
 } whitelisted_component_extension[] = {
   {
     // ChromeOS Hangul Input.
-    "bdgdidmhaijohebebipajioienkglgfo",
+    extension_ime_util::kHangulExtensionId,
     "/usr/share/chromeos-assets/input_methods/hangul",
   },
+  {
+    // Official Google Japanese Input.
+    extension_ime_util::kMozcExtensionId,
+    "/usr/share/chromeos-assets/input_methods/nacl_mozc",
+  },
 #if defined(OFFICIAL_BUILD)
   {
     // Official Google XKB Input.
-    "jkghodnilhceideoidjikpgommlajknk",
+    extension_ime_util::kXkbExtensionId,
     "/usr/share/chromeos-assets/input_methods/google_xkb",
   },
   {
     // Official Google Keyboards Input.
-    "habcdindjejkmepknlhkkloncjcpcnbf",
+    extension_ime_util::kM17nExtensionId,
     "/usr/share/chromeos-assets/input_methods/google_keyboards",
   },
   {
-    // Official Google Japanese Input.
-    "fpfbhcjppmaeaijcidgiibchfbnhbelj",
-    "/usr/share/chromeos-assets/input_methods/nacl_mozc",
-  },
-  {
     // Google input tools.
-    "gjaehgfemfahhmlgpdfknkhdnemmolop",
+    extension_ime_util::kT13nExtensionId,
     "/usr/share/chromeos-assets/input_methods/input_tools",
   },
 #else
   {
     // Open-sourced ChromeOS xkb extension.
-    "fgoepimhcoialccpbmpnnblemnepkkao",
+    extension_ime_util::kXkbExtensionId,
     "/usr/share/chromeos-assets/input_methods/xkb",
   },
   {
     // Open-sourced ChromeOS Keyboards extension.
-    "jhffeifommiaekmbkkjlpmilogcfdohp",
+    extension_ime_util::kM17nExtensionId,
     "/usr/share/chromeos-assets/input_methods/keyboard_layouts",
   },
   {
     // Open-sourced Pinyin Chinese Input Method.
-    "cpgalbafkoofkjmaeonnfijgpfennjjn",
+    extension_ime_util::kChinesePinyinExtensionId,
     "/usr/share/chromeos-assets/input_methods/pinyin",
   },
   {
     // Open-sourced Zhuyin Chinese Input Method.
-    "ekbifjdfhkmdeeajnolmgdlmkllopefi",
+    extension_ime_util::kChineseZhuyinExtensionId,
     "/usr/share/chromeos-assets/input_methods/zhuyin",
   },
   {
     // Open-sourced Cangjie Chinese Input Method.
-    "aeebooiibjahgpgmhkeocbeekccfknbj",
+    extension_ime_util::kChineseCangjieExtensionId,
     "/usr/share/chromeos-assets/input_methods/cangjie",
   },
-  {
-    // Open-sourced Mozc Japanese Input.
-    "bbaiamgfapehflhememkfglaehiobjnk",
-    "/usr/share/chromeos-assets/input_methods/nacl_mozc",
-  },
 #endif
   {
     // Braille hardware keyboard IME that works together with ChromeVox.