Revert of Null check for IME descriptor in GetKeyboardLayoutsForResovledLocale

chrome/browser/ui/webui/chromeos/login/l10n_util.cc

 // Copyright 2014 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/ui/webui/chromeos/login/l10n_util.h"
 
 #include <stddef.h>
 
 #include <iterator>
 #include <map>
@@ skipping 304 matching lines @@
                                       &layouts);
   GetAndMergeKeyboardLayoutsForLocale(util, resolved_locale, &selected,
                                       &layouts);
 
   std::unique_ptr<base::ListValue> input_methods_list(new base::ListValue);
   std::set<std::string> input_methods_added;
   for (std::vector<std::string>::const_iterator it = layouts.begin();
        it != layouts.end(); ++it) {
     const input_method::InputMethodDescriptor* ime =
         util->GetInputMethodDescriptorFromId(*it);
-    // TODO(tbarzic): This is added to avoid crash loop on starting public
-    //     session. The problem should be properly fixed, and this workaround
-    //     removed.
-    if (!ime) {
-      LOG(WARNING) << *it << " layout not found.";
-      continue;
-    }
     if (!InsertString(ime->id(), &input_methods_added))
       continue;
     input_methods_list->Append(CreateInputMethodsEntry(*ime, selected));
   }
 
   callback.Run(std::move(input_methods_list));
 }
 
 // For "UI Language" drop-down menu at OOBE screen we need to decide which
 // entry to mark "selected". If user has just selected "requested_locale",
@@ skipping 262 matching lines @@
 std::unique_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() {
   const input_method::InputMethodDescriptor current_input_method =
       input_method::InputMethodManager::Get()
           ->GetActiveIMEState()
           ->GetCurrentInputMethod();
   return CreateInputMethodsEntry(current_input_method,
                                  current_input_method.id());
 }
 
 }  // namespace chromeos