Split the hole punching logic from GOOGLE_TV ifdef to VIDEO_HOLE

content/common/media/media_player_messages_android.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.
 
 // IPC messages for android media player.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
@@ skipping 252 matching lines @@
 // Sent when the data was read from the ChunkDemuxer.
 IPC_MESSAGE_CONTROL2(MediaPlayerHostMsg_ReadFromDemuxerAck,
                      int /* demuxer_client_id */,
                      media::DemuxerData)
 
 // Inform the media source player of changed media duration from demuxer.
 IPC_MESSAGE_CONTROL2(MediaPlayerHostMsg_DurationChanged,
                      int /* demuxer_client_id */,
                      base::TimeDelta /* duration */)
 
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
 // Notify the player about the external surface, requesting it if necessary.
 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
                     int /* player_id */,
                     bool /* is_request */,
                     gfx::RectF /* rect */)
-
-#endif
+#endif  // defined(VIDEO_HOLE)
 
 // Messages for encrypted media extensions API ------------------------------
 // TODO(xhwang): Move the following messages to a separate file.
 
 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM,
                     int /* media_keys_id */,
                     std::vector<uint8> /* uuid */,
                     GURL /* frame url */)
 
 IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_CreateSession,
@@ skipping 30 matching lines @@
 
 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     media::MediaKeys::KeyError /* error_code */,
                     int /* system_code */)