Move GPU device/driver info related code from content to gpu.

content/gpu/gpu_info_collector_android.cc

Index: content/gpu/gpu_info_collector_android.cc
===================================================================
--- content/gpu/gpu_info_collector_android.cc	(revision 201645)
+++ content/gpu/gpu_info_collector_android.cc	(working copy)
@@ -1,80 +0,0 @@
-// Copyright (c) 2012 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/gpu/gpu_info_collector.h"
-
-#include "base/android/build_info.h"
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/string_split.h"
-
-namespace {
-
-std::string GetDriverVersionFromString(const std::string& version_string) {
-  // Extract driver version from the second number in a string like:
-  // "OpenGL ES 2.0 V@6.0 AU@ (CL@2946718)"
-
-  // Exclude first "2.0".
-  size_t begin = version_string.find_first_of("0123456789");
-  if (begin == std::string::npos)
-    return "0";
-  size_t end = version_string.find_first_not_of("01234567890.", begin);
-
-  // Extract number of the form "%d.%d"
-  begin = version_string.find_first_of("0123456789", end);
-  if (begin == std::string::npos)
-    return "0";
-  end = version_string.find_first_not_of("01234567890.", begin);
-  std::string sub_string;
-  if (end != std::string::npos)
-    sub_string = version_string.substr(begin, end - begin);
-  else
-    sub_string = version_string.substr(begin);
-  std::vector<std::string> pieces;
-  base::SplitString(sub_string, '.', &pieces);
-  if (pieces.size() < 2)
-    return "0";
-  return pieces[0] + "." + pieces[1];
-}
-
-}
-
-namespace gpu_info_collector {
-
-bool CollectContextGraphicsInfo(content::GPUInfo* gpu_info) {
-  return CollectBasicGraphicsInfo(gpu_info);
-}
-
-GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
-  DCHECK(vendor_id && device_id);
-  *vendor_id = 0;
-  *device_id = 0;
-  return kGpuIDNotSupported;
-}
-
-bool CollectBasicGraphicsInfo(content::GPUInfo* gpu_info) {
-  gpu_info->can_lose_context = false;
-  gpu_info->finalized = true;
-
-  gpu_info->machine_model = base::android::BuildInfo::GetInstance()->model();
-
-  // Create a short-lived context on the UI thread to collect the GL strings.
-  return CollectGraphicsInfoGL(gpu_info);
-}
-
-bool CollectDriverInfoGL(content::GPUInfo* gpu_info) {
-  gpu_info->driver_version = GetDriverVersionFromString(
-      gpu_info->gl_version_string);
-  return true;
-}
-
-void MergeGPUInfo(content::GPUInfo* basic_gpu_info,
-                  const content::GPUInfo& context_gpu_info) {
-  MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
-}
-
-}  // namespace gpu_info_collector