Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build.

content/common/gpu/gpu_video_decode_accelerator.h

 // Copyright (c) 2011 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_GPU_GPU_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_GPU_GPU_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
   virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE;
   virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) OVERRIDE;
   virtual void NotifyFlushDone() OVERRIDE;
   virtual void NotifyAbortDone() OVERRIDE;
 
   // Function to delegate sending to actual sender.
   virtual bool Send(IPC::Message* message);
 
   void set_video_decode_accelerator(
       media::VideoDecodeAccelerator* accelerator) {
-    DCHECK(!video_decode_accelerator_.get());
-    video_decode_accelerator_.reset(accelerator);
+    video_decode_accelerator_ = accelerator;
   }
 
  private:
   // Handlers for IPC messages.
   void OnGetConfigs(const std::vector<uint32>& config,
                     std::vector<uint32>* configs);
   void OnInitialize(const std::vector<uint32>& configs);
   void OnDecode(int32 id, base::SharedMemoryHandle handle, int32 size);
   void OnAssignGLESBuffers(const std::vector<int32> buffer_ids,
                            const std::vector<uint32> texture_ids,
                            const std::vector<uint32> context_ids,
                            const std::vector<gfx::Size> sizes);
   void OnAssignSysmemBuffers(const std::vector<int32> buffer_ids,
                              const std::vector<base::SharedMemoryHandle> data,
                              const std::vector<gfx::Size> sizes);
   void OnReusePictureBuffer(int32 picture_buffer_id);
   void OnFlush();
   void OnAbort();
 
   // Pointer to the IPC message sender.
   IPC::Message::Sender* sender_;
 
   // Route ID to communicate with the host.
   int32 route_id_;
 
   // Pointer to the underlying VideoDecodeAccelerator.
-  scoped_ptr<media::VideoDecodeAccelerator> video_decode_accelerator_;
+  media::VideoDecodeAccelerator* video_decode_accelerator_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAccelerator);
 };
 
 #endif  // CONTENT_GPU_GPU_VIDEO_DECODE_ACCELERATOR_H_