Add Create() function to AudioCodecBridge and VideoCodecBridge to allow return of null pointers

content/common/gpu/media/android_video_decode_accelerator.h

 // Copyright (c) 2013 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_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <dlfcn.h>
 #include <list>
 #include <map>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/video/video_decode_accelerator.h"
 
 namespace gfx {
 class SurfaceTextureBridge;
 }
 
 namespace content {
-
 // A VideoDecodeAccelerator implementation for Android.
 // This class decodes the input encoded stream by using Android's MediaCodec
 // class. http://developer.android.com/reference/android/media/MediaCodec.html
 class CONTENT_EXPORT AndroidVideoDecodeAccelerator :
     public media::VideoDecodeAccelerator {
  public:
   // Does not take ownership of |client| which must outlive |*this|.
   AndroidVideoDecodeAccelerator(
       media::VideoDecodeAccelerator::Client* client,
       const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
@@ skipping 13 matching lines @@
   enum State {
     NO_ERROR,
     ERROR,
   };
 
   static const base::TimeDelta kDecodePollDelay;
 
   virtual ~AndroidVideoDecodeAccelerator();
 
   // Configures |media_codec_| with the given codec parameters from the client.
-  void ConfigureMediaCodec();
+  bool ConfigureMediaCodec();
 
   // Sends the current picture on the surface to the client.
   void SendCurrentSurfaceToClient(int32 bitstream_id);
 
   // Does pending IO tasks if any. Once this is called, it polls |media_codec_|
   // until it finishes pending tasks. For the polling, |kDecodePollDelay| is
   // used.
   void DoIOTask();
 
   // Feeds input data to |media_codec_|. This checks
@@ skipping 83 matching lines @@
 
   // Keeps track of bitstream ids notified to the client with
   // NotifyEndOfBitstreamBuffer() before getting output from the bitstream.
   std::list<int32> bitstreams_notified_in_advance_;
 
   // Owner of the GL context. Used to restore the context state.
   base::WeakPtr<gpu::gles2::GLES2Decoder> gl_decoder_;
 
   // Used for copy the texture from |surface_texture_| to picture buffers.
   scoped_ptr<gpu::CopyTextureCHROMIUMResourceManager> copier_;
+
+  friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_