Android: Remove Surface cruft

content/common/gpu/gpu_messages.h

 // 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.
 
 // Multiply-included message file, hence no include guard here, but see below
 // for a much smaller-than-usual include guard section.
 
 #include <string>
 #include <vector>
 
@@ skipping 88 matching lines @@
   IPC_STRUCT_MEMBER(float, m13)
   IPC_STRUCT_MEMBER(float, m20)
   IPC_STRUCT_MEMBER(float, m21)
   IPC_STRUCT_MEMBER(float, m22)
   IPC_STRUCT_MEMBER(float, m23)
   IPC_STRUCT_MEMBER(float, m30)
   IPC_STRUCT_MEMBER(float, m31)
   IPC_STRUCT_MEMBER(float, m32)
   IPC_STRUCT_MEMBER(float, m33)
 IPC_STRUCT_END()
-IPC_ENUM_TRAITS(content::SurfaceTexturePeer::SurfaceTextureTarget)
 #endif
 
 IPC_STRUCT_TRAITS_BEGIN(content::DxDiagNode)
   IPC_STRUCT_TRAITS_MEMBER(values)
   IPC_STRUCT_TRAITS_MEMBER(children)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::GpuPerformanceStats)
   IPC_STRUCT_TRAITS_MEMBER(graphics)
   IPC_STRUCT_TRAITS_MEMBER(gaming)
@@ skipping 311 matching lines @@
 #if defined(OS_ANDROID)
 // Register the StreamTextureProxy class with the GPU process, so that
 // the renderer process will get notified whenever a frame becomes available.
 IPC_SYNC_MESSAGE_CONTROL2_1(GpuChannelMsg_RegisterStreamTextureProxy,
                             int32, /* stream_id */
                             gfx::Size, /* initial_size */
                             int /* route_id */)
 
 // Tells the GPU process create and send the java surface texture object to
 // the renderer process through the binder thread.
-IPC_MESSAGE_CONTROL4(GpuChannelMsg_EstablishStreamTexture,
+IPC_MESSAGE_CONTROL3(GpuChannelMsg_EstablishStreamTexture,
                      int32, /* stream_id */
-                     content::SurfaceTexturePeer::SurfaceTextureTarget,
-                     /* type */
                      int32, /* primary_id */
                      int32 /* secondary_id */)
 #endif
 
 // Tells the GPU process to collect rendering stats.
 IPC_SYNC_MESSAGE_CONTROL1_1(GpuChannelMsg_CollectRenderingStatsForSurface,
                             int32 /* surface_id */,
                             content::GpuRenderingStats /* stats */)
 
 #if defined(OS_ANDROID)
@@ skipping 198 matching lines @@
 
 // Confirm decoder has been flushed.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone)
 
 // Confirm decoder has been reset.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone)
 
 // Video decoder has encountered an error.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification,
                     uint32) /* Error ID */