Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / base / ime / chromeos / ime_bridge.cc

diff --git a/src/ui/base/ime/chromeos/ime_bridge.cc b/src/ui/base/ime/chromeos/ime_bridge.cc
index fade3eb..da87701 100644 (file)
--- a/src/ui/base/ime/chromeos/ime_bridge.cc
+++ b/src/ui/base/ime/chromeos/ime_bridge.cc
@@ -64,12 +64,16 @@ class IMEBridgeImpl : public IMEBridge {
   // IMEBridge override.
   virtual IMEEngineHandlerInterface* SetCurrentEngineHandlerById(
       const std::string& engine_id) OVERRIDE {
-    if (engine_id.empty()) {
+    std::map<std::string, IMEEngineHandlerInterface*>::const_iterator itor =
+        engine_handler_map_.find(engine_id);
+    // |engine_id| must be found unless it's empty, but if it's not found, fall
+    // back to NULL when non-debug build.
+    DCHECK(itor != engine_handler_map_.end() || engine_id.empty());
+    if (itor == engine_handler_map_.end()) {
       engine_handler_ = NULL;
       return NULL;
     }
 
-    DCHECK(engine_handler_map_.find(engine_id) != engine_handler_map_.end());
     engine_handler_ = engine_handler_map_[engine_id];
     return engine_handler_;
   }