[Athena] Hotfix for IME component extension loading crash on sign in

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 3be6ec72b6b48eb0758358a1ffc9cc48b117a995..8b62290fe0f35de93264cab774ea4661ae1407ac 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
@@ -254,6 +254,13 @@ void DoLoadExtension(Profile* profile,
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(profile);
   ExtensionService* extension_service = extension_system->extension_service();
+#if defined(USE_ATHENA)
+  // ExtensionService is not properly initialized for Athena yet.
+  // http://crbug.com/426787
+  if (!extension_service)
+    return;
+#endif
+  DCHECK(extension_service);
   if (extension_service->GetExtensionById(extension_id, false))
     return;
   const std::string loaded_extension_id =
@@ -293,12 +300,12 @@ void ComponentExtensionIMEManagerImpl::Load(Profile* profile,
                                             const std::string& extension_id,
                                             const std::string& manifest,
                                             const base::FilePath& file_path) {
-  if (base::SysInfo::IsRunningOnChromeOS()) {
+//  if (base::SysInfo::IsRunningOnChromeOS()) {

[Nikita (slow), 2014/10/27 10:38:41]

Removing these in next patchset.

     // In the case of real Chrome OS device, the no need to check the file path
     // for preinstalled files existence.
     DoLoadExtension(profile, extension_id, manifest, file_path);
     return;
-  }
+//  }
   // If current environment is linux_chromeos, check the existence of file path
   // to avoid unnecessary extension loading and InputMethodEngine creation, so
   // that the virtual keyboard web content url won't be override by IME