Revert of Refactor Vaapi video decoder/encoder in preparation of Freon support

content/common/gpu/media/vaapi_picture.cc

Index: content/common/gpu/media/vaapi_picture.cc
diff --git a/content/common/gpu/media/vaapi_picture.cc b/content/common/gpu/media/vaapi_picture.cc
deleted file mode 100644
index 10de50b1f8f8a98f5a2df695f24f0bf317d598ad..0000000000000000000000000000000000000000
--- a/content/common/gpu/media/vaapi_picture.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2014 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 "content/common/gpu/media/vaapi_picture.h"
-#include "content/common/gpu/media/vaapi_wrapper.h"
-#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_implementation.h"
-
-#if defined(USE_X11)
-#include "content/common/gpu/media/vaapi_tfp_picture.h"
-#endif
-
-namespace content {
-
-// static
-linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(
-    const scoped_refptr<VaapiWrapper>& vaapi_wrapper,
-    const base::Callback<bool(void)> make_context_current,
-    int32 picture_buffer_id,
-    uint32 texture_id,
-    const gfx::Size& size) {
-  linked_ptr<VaapiPicture> picture;
-#if defined(USE_X11)
-  picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current,
-                                    picture_buffer_id, texture_id, size));
-#endif  // USE_X11
-
-  if (picture.get() && !picture->Initialize())
-    picture.reset();
-
-  return picture;
-}
-
-// static
-uint32 VaapiPicture::GetGLTextureTarget() {
-  return GL_TEXTURE_2D;
-}
-
-}  // namespace content