Move IsRunningOnChromeOS to SysInfo

content/public/test/browser_test_base.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 "content/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/message_loop/message_loop.h"
+#include "base/sys_info.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_errors.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_POSIX)
 #include "base/process/process_handle.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "base/chromeos/chromeos_version.h"
-#endif
-
 namespace content {
 namespace {
 
 #if defined(OS_POSIX)
 // On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make
 // debugging easier) and also exit with a known error code (so that the test
 // framework considers this a failure -- http://crbug.com/57578).
 // Note: We only want to do this in the browser process, and not forked
 // processes. That might lead to hangs because of locks inside tcmalloc or the
 // OS. See http://crbug.com/141302.
@@ skipping 129 matching lines @@
 
 #if defined(OS_ANDROID)
   // On Android we always use a real GPU.
   allow_osmesa_ = false;
 #endif
 
 #if defined(OS_CHROMEOS)
   // If the test is running on the chromeos envrionment (such as
   // device or vm bots), the compositor will use real GL contexts, and
   // we should use real GL bindings with it.
-  if (base::chromeos::IsRunningOnChromeOS())
+  if (base::SysInfo::IsRunningOnChromeOS())
     allow_osmesa_ = false;
 #endif
 
   if (command_line->HasSwitch(switches::kUseGL)) {
     NOTREACHED() <<
         "kUseGL should not be used with tests. Try kUseGpuInTests instead.";
   }
 
   if (allow_osmesa_) {
     command_line->AppendSwitchASCII(
@@ skipping 61 matching lines @@
       RenderProcessHostImpl::GetInProcessRendererThreadForTesting();
   CHECK(renderer_loop);
 
   renderer_loop->PostTask(
       FROM_HERE,
       base::Bind(&RunTaskOnRendererThread, task, runner->QuitClosure()));
   runner->Run();
 }
 
 }  // namespace content