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

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 <algorithm>
 
 #include "base/files/file_util.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 236 matching lines @@
   return extension_service->component_loader();
 }
 
 void DoLoadExtension(Profile* profile,
                      const std::string& extension_id,
                      const std::string& manifest,
                      const base::FilePath& file_path) {
   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 =
       GetComponentLoader(profile)->Add(manifest, file_path);
   DCHECK_EQ(loaded_extension_id, extension_id);
 }
 
 bool CheckFilePath(const base::FilePath* file_path) {
   return base::PathExists(*file_path);
 }
@@ skipping 19 matching lines @@
 }
 
 std::vector<ComponentExtensionIME> ComponentExtensionIMEManagerImpl::ListIME() {
   return component_extension_list_;
 }
 
 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
   // component extensions.
   base::FilePath* copied_file_path = new base::FilePath(file_path);
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&CheckFilePath,
                  base::Unretained(copied_file_path)),
@@ skipping 183 matching lines @@
 
       ComponentExtensionEngine engine;
       ReadEngineComponent(component_ime, *dictionary, &engine);
       component_ime.engines.push_back(engine);
     }
     out_imes->push_back(component_ime);
   }
 }
 
 }  // namespace chromeos