Decouple browser-specific GPU IPC messages from GPU service IPCs

content/browser/renderer_host/gpu_message_filter.cc

Index: content/browser/renderer_host/gpu_message_filter.cc
diff --git a/content/browser/renderer_host/gpu_message_filter.cc b/content/browser/renderer_host/gpu_message_filter.cc
index bf1fa07948461ea02e5be36bc04d80fe0e2d82cb..00ba8699f4e601d01583a83930f29924ed22e5bb 100644
--- a/content/browser/renderer_host/gpu_message_filter.cc
+++ b/content/browser/renderer_host/gpu_message_filter.cc
@@ -13,12 +13,12 @@
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/child_process_host_impl.h"
-#include "content/common/gpu/gpu_messages.h"
+#include "content/common/gpu/gpu_browser_messages.h"
 
 namespace content {
 
 GpuMessageFilter::GpuMessageFilter(int render_process_id)
-    : BrowserMessageFilter(GpuMsgStart),
+    : BrowserMessageFilter(GpuBrowserMsgStart),
       gpu_process_id_(0),
       render_process_id_(render_process_id),
       weak_ptr_factory_(this) {
@@ -32,9 +32,10 @@ GpuMessageFilter::~GpuMessageFilter() {
 bool GpuMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(GpuMessageFilter, message)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuHostMsg_EstablishGpuChannel,
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuBrowserHostMsg_EstablishGpuChannel,
                                     OnEstablishGpuChannel)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuHostMsg_HasGpuProcess, OnHasGpuProcess)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuBrowserHostMsg_HasGpuProcess,
+                                    OnHasGpuProcess)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -94,7 +95,7 @@ void GpuMessageFilter::EstablishChannelCallback(
     const gpu::GPUInfo& gpu_info) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  GpuHostMsg_EstablishGpuChannel::WriteReplyParams(
+  GpuBrowserHostMsg_EstablishGpuChannel::WriteReplyParams(
       reply.get(), render_process_id_, channel, gpu_info);
   Send(reply.release());
 }
@@ -103,7 +104,8 @@ void GpuMessageFilter::GetGpuProcessHandlesCallback(
     scoped_ptr<IPC::Message> reply,
     const std::list<base::ProcessHandle>& handles) {
   bool has_gpu_process = handles.size() > 0;
-  GpuHostMsg_HasGpuProcess::WriteReplyParams(reply.get(), has_gpu_process);
+  GpuBrowserHostMsg_HasGpuProcess::WriteReplyParams(reply.get(),
+                                                    has_gpu_process);
   Send(reply.release());
 }