touch: Always expect XInput2 availability.

chrome/browser/browser_shutdown.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/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 114 matching lines @@
   base::ThreadRestrictions::SetIOAllowed(true);
 
   // Shutdown the IPC channel to the service processes.
   ServiceProcessControl::GetInstance()->Disconnect();
 
 #if defined(OS_CHROMEOS)
   // The system key event listener needs to be shut down earlier than when
   // Singletons are finally destroyed in AtExitManager.
   chromeos::SystemKeyEventListener::GetInstance()->Stop();
 
-  // TODO(yusukes): Remove the #if once the ARM bot (crbug.com/84694) is fixed.
-#if defined(HAVE_XINPUT2)
   // The XInput2 event listener needs to be shut down earlier than when
   // Singletons are finally destroyed in AtExitManager.
   chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();
 #endif
-#endif
 
   // WARNING: During logoff/shutdown (WM_ENDSESSION) we may not have enough
   // time to get here. If you have something that *must* happen on end session,
   // consider putting it in BrowserProcessImpl::EndSession.
   PrefService* prefs = g_browser_process->local_state();
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   PrefService* user_prefs = profile_manager->GetDefaultProfile()->GetPrefs();
 
   chrome_browser_net::SavePredictorStateForNextStartupAndTrim(user_prefs);
 
@@ skipping 177 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
 #if defined(USE_X11)
   if (GetShutdownType() == browser_shutdown::END_SESSION)
     return true;
 #endif
   return false;
 }
 
 }  // namespace browser_shutdown