chromeos: Fix chrome --mus startup crash on device

chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Index: chrome/browser/chromeos/input_method/input_method_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index dca79055d4001816c96f3ec11b58286c3dff6f6f..94138a55a470a760aff78353d317df0be1f523af 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -22,6 +22,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/ash_config.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h"
 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h"
@@ -29,7 +30,6 @@
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/system/devicemode.h"
@@ -923,10 +923,12 @@ InputMethodManagerImpl::InputMethodManagerImpl(
       is_ime_menu_activated_(false) {
   // TODO(mohsen): Revisit using FakeImeKeyboard with mash when InputController

[kylechar, 2017/04/06 19:36:23]

Can you change the TODO to be TODO(crbug.com/642863) and remove the link to
crbug.com/601981?

[James Cook, 2017/04/06 19:43:42]

Done.

   // work is ready. http://crbug.com/601981
-  if (IsRunningAsSystemCompositor() && !ash_util::IsRunningInMash())
+  if (IsRunningAsSystemCompositor() &&
+      chromeos::GetAshConfig() == ash::Config::CLASSIC) {
     keyboard_.reset(ImeKeyboard::Create());
-  else
+  } else {
     keyboard_.reset(new FakeImeKeyboard());
+  }
 
   // Initializes the system IME list.
   std::unique_ptr<ComponentExtensionIMEManagerDelegate> comp_delegate(