Update |current_input_method_| before notifying observers to fix Aura browser_tests

chrome/browser/chromeos/input_method/input_method_manager.cc

 // Copyright (c) 2011 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/input_method_manager.h"
 
 #include <algorithm>
 
 #include <glib.h>
 
@@ skipping 667 matching lines @@
     }
   }
 
   // Change the keyboard layout per input method configuration being
   // updated, if necessary. See also: MaybeStartInputMethodDaemon().
   void MaybeChangeCurrentKeyboardLayout(const std::string& section,
                                         const std::string& config_name,
                                         const ImeConfigValue& value) {
     if (section == language_prefs::kGeneralSectionName &&
         config_name == language_prefs::kPreloadEnginesConfigName) {
-      if (value.string_list_value.size() == 1) {
+      if (value.string_list_value.size() == 1 ||
+          (value.string_list_value.size() != 0 &&
+           current_input_method_.id().empty())) {
         // This is necessary to initialize current_input_method_. This is also
         // necessary when the current layout (e.g. INTL) out of two (e.g. US and
         // INTL) is disabled.
         ChangeCurrentInputMethodFromId(value.string_list_value[0]);
       }
+      DCHECK(!current_input_method_.id().empty());
+
       // Update the indicator.
       // TODO(yusukes): Remove ActiveInputMethodsChanged notification in
       // FlushImeConfig().
       const size_t num_active_input_methods = GetNumActiveInputMethods();
       FOR_EACH_OBSERVER(InputMethodManager::Observer, observers_,
                         ActiveInputMethodsChanged(this,
                                                   current_input_method(),
                                                   num_active_input_methods));
     }
   }
@@ skipping 681 matching lines @@
   return InputMethodManagerImpl::GetInstance();
 }
 
 }  // namespace input_method
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(
     chromeos::input_method::InputMethodManagerImpl);