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

chrome/browser/gpu_process_host_ui_shim.h

 // 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 CHROME_BROWSER_GPU_PROCESS_HOST_UI_SHIM_H_
 #define CHROME_BROWSER_GPU_PROCESS_HOST_UI_SHIM_H_
 #pragma once
 
 // This class lives on the UI thread and supports classes like the
 // BackingStoreProxy, which must live on the UI thread. The IO thread
 // portion of this class, the GpuProcessHost, is responsible for
 // shuttling messages between the browser and GPU processes.
 
 #include <map>
 #include <queue>
 
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/process.h"
 #include "base/threading/non_thread_safe.h"
+#include "content/common/gpu/gpu_channel_manager.h"
+#include "content/common/gpu/gpu_info.h"
 #include "content/common/gpu_feature_flags.h"
-#include "content/common/gpu_info.h"
 #include "content/common/message_router.h"
-#include "content/gpu/gpu_render_thread.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Size;
 }
 
 class GpuDataManager;
 struct GPUCreateCommandBufferConfig;
 struct GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params;
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
@@ skipping 162 matching lines @@
 
   // Encapsulates surfaces that we acquire when creating view command buffers.
   // We assume that a render view has at most 1 such surface associated
   // with it.  Multimap is used to simulate reference counting, see comment in
   // GpuProcessHostUIShim::CreateViewCommandBuffer.
   class ViewSurface;
   typedef std::multimap<ViewID, linked_ptr<ViewSurface> > ViewSurfaceMap;
   ViewSurfaceMap acquired_surfaces_;
 
   // In single process and in process GPU mode, this references the
-  // GpuRenderThread or null otherwise. It must be called and deleted on the GPU
-  // thread.
-  GpuRenderThread* gpu_render_thread_;
+  // GpuChannelManager or null otherwise. It must be called and deleted on the
+  // GPU thread.
+  GpuChannelManager* gpu_channel_manager_;
 
   // This is likewise single process / in process GPU specific. This is a Sender
   // implementation that forwards IPC messages to this UI shim on the UI thread.
   IPC::Channel::Sender* ui_thread_sender_;
 };
 
 #endif  // CHROME_BROWSER_GPU_PROCESS_HOST_UI_SHIM_H_