Remove the flag g_use_wrapped_extension_keyboard_layouts.

chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.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 "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #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"
 #include "extensions/common/extension_l10n_util.h"
 #include "extensions/common/file_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
 struct WhitelistedComponentExtensionIME {
   const char* id;
   const char* path;
 } 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.
     extension_misc::kBrailleImeExtensionId,
     extension_misc::kBrailleImeExtensionPath,
   },
 };
 
 extensions::ComponentLoader* GetComponentLoader() {
   // TODO(skuhne, nkostylev): At this time the only thing which makes sense here
@@ skipping 242 matching lines @@
     std::vector<ComponentExtensionIME>* result,
     const base::Closure& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(result);
   component_extension_list_ = *result;
   is_initialized_ = true;
   callback.Run();
 }
 
 }  // namespace chromeos