Group AVDA output surface into AVDASurfaceBundle.

media/gpu/avda_surface_bundle.cc

Index: media/gpu/avda_surface_bundle.cc
diff --git a/media/gpu/avda_surface_bundle.cc b/media/gpu/avda_surface_bundle.cc
new file mode 100644
index 0000000000000000000000000000000000000000..12186a1b96cf2d5304b7091c85095ae9bfb76be4
--- /dev/null
+++ b/media/gpu/avda_surface_bundle.cc
@@ -0,0 +1,22 @@
+// Copyright 2017 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.
+
+#include "media/gpu/avda_surface_bundle.h"
+
+namespace media {
+
+AVDASurfaceBundle::AVDASurfaceBundle(int surface_id) : surface_id(surface_id) {}
+
+AVDASurfaceBundle::~AVDASurfaceBundle() {
+  // Explicitly free the surface first, just to be sure that it's deleted before
+  // the SurfaceTexture is.
+  surface = gl::ScopedJavaSurface();
+  // Also release the back buffers.  We might want to let the consumer do this
+  // after it has swapped the back buffer it wants, but we don't.
+  if (surface_texture)
+    surface_texture->ReleaseSurfaceTexture();
+  surface_texture = nullptr;
+}
+
+}  // namespace media