Add ContentVideoViewOverlay to AVDA.

media/gpu/avda_picture_buffer_manager.h

Index: media/gpu/avda_picture_buffer_manager.h
diff --git a/media/gpu/avda_picture_buffer_manager.h b/media/gpu/avda_picture_buffer_manager.h
index cf5ecbcfd0f9425f96134af89e82390c858c5eeb..377da6003277cc7939164466e41c9472e2c304cc 100644
--- a/media/gpu/avda_picture_buffer_manager.h
+++ b/media/gpu/avda_picture_buffer_manager.h
@@ -43,14 +43,21 @@ class MEDIA_GPU_EXPORT AVDAPictureBufferManager {
   explicit AVDAPictureBufferManager(AVDAStateProvider* state_provider);
   virtual ~AVDAPictureBufferManager();
 
-  // Must be called before anything else. If |surface_id| is |kNoSurfaceID|
-  // then a new SurfaceTexture will be returned. Otherwise, the corresponding
-  // SurfaceView will be returned.
+  // Call either InitializeForOverlay or InitializeForSurfaceTexture before
+  // anything else.  InitializeForOverlay will set us up to render codec buffers
+  // at the approrpriate time for display, but will assume that consuming the
+  // resulting buffers is handled elsewhere (e.g., SurfaceFlinger).
   //
-  // May be called multiple times to switch to a new |surface_id|. Picture
-  // buffers will be updated to use the new surface during the call to
-  // UseCodecBufferForPictureBuffer().
-  gl::ScopedJavaSurface Initialize(int surface_id);
+  // InitializeForSurfaceTexture will create a SurfaceTexture and return the
+  // surface for it.  We will arrange to consume the buffers at the right time,
+  // in addition to releasing codec buffers for rendering.
+  //
+  // One may call these multiple times to change between overlay and ST.
+  //
+  // Picture buffers will be updated to reflect the new surface during the call
+  // to UseCodecBufferForPicture().
+  void InitializeForOverlay();
+  gl::ScopedJavaSurface InitializeForSurfaceTexture();
 
   void Destroy(const PictureBufferMap& buffers);