Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu.

content/common/gpu_info.h

Index: content/common/gpu_info.h
===================================================================
--- content/common/gpu_info.h	(revision 80399)
+++ content/common/gpu_info.h	(working copy)
@@ -1,86 +0,0 @@
-// 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.
-
-#ifndef CONTENT_COMMON_GPU_INFO_H_
-#define CONTENT_COMMON_GPU_INFO_H_
-#pragma once
-
-// Provides access to the GPU information for the system
-// on which chrome is currently running.
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/time.h"
-#include "build/build_config.h"
-#include "content/common/dx_diag_node.h"
-
-struct GPUInfo {
-  GPUInfo();
-  ~GPUInfo();
-
-  // If it's the same GPU, i.e., device id and vendor id are the same, then
-  // copy over the fields that are not set yet and ignore the rest.
-  // If it's a different GPU, then reset and copy over everything.
-  // Return true if something changes that may affect blacklisting; currently
-  // they are device_id, vendor_id, driver_vendor, driver_version, driver_date,
-  // and gl_renderer.
-  bool Merge(const GPUInfo& other);
-
-  // Whether more GPUInfo fields might be collected in the future.
-  bool finalized;
-
-  // The amount of time taken to get from the process starting to the message
-  // loop being pumped.
-  base::TimeDelta initialization_time;
-
-  // The DWORD (uint32) representing the graphics card vendor id.
-  uint32 vendor_id;
-
-  // The DWORD (uint32) representing the graphics card device id.  Device ids
-  // are unique to vendor, not to one another.
-  uint32 device_id;
-
-  // The vendor of the graphics driver currently installed.
-  std::string driver_vendor;
-
-  // The version of the graphics driver currently installed.
-  std::string driver_version;
-
-  // The date of the graphics driver currently installed.
-  std::string driver_date;
-
-  // The version of the pixel/fragment shader used by the gpu.
-  std::string pixel_shader_version;
-
-  // The version of the vertex shader used by the gpu.
-  std::string vertex_shader_version;
-
-  // The version of OpenGL we are using.
-  // TODO(zmo): should be able to tell if it's GL or GLES.
-  std::string gl_version;
-
-  // The GL_VERSION string.  "" if we are not using OpenGL.
-  std::string gl_version_string;
-
-  // The GL_VENDOR string.  "" if we are not using OpenGL.
-  std::string gl_vendor;
-
-  // The GL_RENDERER string.  "" if we are not using OpenGL.
-  std::string gl_renderer;
-
-  // The GL_EXTENSIONS string.  "" if we are not using OpenGL.
-  std::string gl_extensions;
-
-  // The device semantics, i.e. whether the Vista and Windows 7 specific
-  // semantics are available.
-  bool can_lose_context;
-
-#if defined(OS_WIN)
-  // The information returned by the DirectX Diagnostics Tool.
-  DxDiagNode dx_diagnostics;
-#endif
-};
-
-#endif  // CONTENT_COMMON_GPU_INFO_H_