 +#include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 +#include "ui/gl/gl_implementation.h"
  #elif defined(OS_ANDROID)
+ #include "content/common/gpu/media/android_copying_backing_strategy.h"
  #include "content/common/gpu/media/android_video_decode_accelerator.h"
- #endif
-@@ -346,7 +347,7 @@ void GpuVideoDecodeAccelerator::BindImage(uint32 client_texture_id,
+@@ -347,7 +348,7 @@ void GpuVideoDecodeAccelerator::BindImage(uint32 client_texture_id,
  scoped_ptr<media::VideoDecodeAccelerator>
  GpuVideoDecodeAccelerator::CreateVaapiVDA() {
    scoped_ptr<media::VideoDecodeAccelerator> decoder;

 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
index 0adf18d..35c49ed 100644
--- a/chrome/browser/password_manager/password_store_factory.cc
+++ b/chrome/browser/password_manager/password_store_factory.cc
@@ -62,7 +62,7 @@ const LocalProfileId kInvalidLocalProfileId =

From 71d233f372d83785b7c22c5f1faef80a1b2a1419 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 15 Sep 2015 01:34:13 -0700
Subject: [PATCH] Media: Use upstream Video Accelerator.

---
 chrome/browser/password_manager/password_store_factory.cc |  2 +-
