Move IsRunningOnChromeOS to SysInfo

chromeos/ime/xkeyboard.cc

 // Copyright 2013 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 "chromeos/ime/xkeyboard.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <queue>
 #include <set>
 #include <utility>
 
-#include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/process/launch.h"
 #include "base/process/process_handle.h"
-#include "base/process/launch.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
 #include "base/threading/thread_checker.h"
 
 // These includes conflict with base/tracked_objects.h so must come last.
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <glib.h>
 
 namespace chromeos {
 namespace input_method {
 namespace {
@@ skipping 76 matching lines @@
 
   // A queue for executing setxkbmap one by one.
   std::queue<std::string> execute_queue_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(XKeyboardImpl);
 };
 
 XKeyboardImpl::XKeyboardImpl()
-    : is_running_on_chrome_os_(base::chromeos::IsRunningOnChromeOS()) {
+    : is_running_on_chrome_os_(base::SysInfo::IsRunningOnChromeOS()) {
   num_lock_mask_ = GetNumLockMask();
 
   // web_input_event_aurax11.cc seems to assume that Mod2Mask is always assigned
   // to Num Lock.
   // TODO(yusukes): Check the assumption is really okay. If not, modify the Aura
   // code, and then remove the CHECK below.
   CHECK(!is_running_on_chrome_os_ || (num_lock_mask_ == Mod2Mask));
   GetLockedModifiers(&current_caps_lock_status_, &current_num_lock_status_);
 }
 
@@ skipping 242 matching lines @@
   return CheckLayoutName(layout_name);
 }
 
 // static
 XKeyboard* XKeyboard::Create() {
   return new XKeyboardImpl();
 }
 
 }  // namespace input_method
 }  // namespace chromeos