Split the hole punching logic from GOOGLE_TV ifdef to VIDEO_HOLE

content/renderer/media/android/renderer_media_player_manager.h

 // Copyright 2013 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_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 62 matching lines @@
 
   // Destroys the player in the browser process
   void DestroyPlayer(int player_id);
 
   // Requests the player to enter fullscreen.
   void EnterFullscreen(int player_id);
 
   // Requests the player to exit fullscreen.
   void ExitFullscreen(int player_id);
 
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
   // Requests an external surface for out-of-band compositing.
   void RequestExternalSurface(int player_id, const gfx::RectF& geometry);
 
   // RenderViewObserver overrides.
   virtual void DidCommitCompositorFrame() OVERRIDE;
-#endif
+#endif  // defined(VIDEO_HOLE)
 
   // Encrypted media related methods.
   void InitializeCDM(int media_keys_id,
                      ProxyMediaKeys* media_keys,
                      const std::vector<uint8>& uuid,
                      const GURL& frame_url);
   void CreateSession(int media_keys_id,
                      uint32 session_id,
                      const std::string& type,
                      const std::vector<uint8>& init_data);
@@ skipping 25 matching lines @@
 
   // Checks whether the Webframe is in fullscreen.
   bool IsInFullscreen(blink::WebFrame* frame);
 
   // Gets the pointer to WebMediaPlayerAndroid given the |player_id|.
   WebMediaPlayerAndroid* GetMediaPlayer(int player_id);
 
   // Gets the pointer to ProxyMediaKeys given the |media_keys_id|.
   ProxyMediaKeys* GetMediaKeys(int media_keys_id);
 
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
   // Gets the list of media players with video geometry changes.
   void RetrieveGeometryChanges(std::map<int, gfx::RectF>* changes);
-#endif
+#endif  // defined(VIDEO_HOLE)
 
  private:
   // Message handlers.
   void OnMediaMetadataChanged(int player_id,
                               base::TimeDelta duration,
                               int width,
                               int height,
                               bool success);
   void OnMediaPlaybackCompleted(int player_id);
   void OnMediaBufferingUpdate(int player_id, int percent);
@@ skipping 36 matching lines @@
 
   // WebFrame of the fullscreen video.
   blink::WebFrame* fullscreen_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_