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

media/base/android/media_codec_bridge_unittest.cc

 // 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.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 79 matching lines @@
 
 namespace media {
 
 static const int kPresentationTimeBase = 100;
 
 TEST(MediaCodecBridgeTest, Initialize) {
   if (!MediaCodecBridge::IsAvailable())
     return;
 
   scoped_ptr<media::MediaCodecBridge> media_codec;
-  media_codec.reset(new VideoCodecBridge(kCodecH264));
+  media_codec.reset(VideoCodecBridge::Create(kCodecH264));
 }
 
 TEST(MediaCodecBridgeTest, DoNormal) {
   if (!MediaCodecBridge::IsAvailable())
     return;
 
   scoped_ptr<media::AudioCodecBridge> media_codec;
-  media_codec.reset(new AudioCodecBridge(kCodecMP3));
+  media_codec.reset(AudioCodecBridge::Create(kCodecMP3));
 
   media_codec->Start(kCodecMP3, 44100, 2, NULL, 0, false);
 
   int input_buf_index = media_codec->DequeueInputBuffer(
       MediaCodecBridge::kTimeOutInfinity);
   ASSERT_GE(input_buf_index, 0);
 
   int64 input_pts = kPresentationTimeBase;
   media_codec->QueueInputBuffer(
       input_buf_index, test_mp3, sizeof(test_mp3),
@@ skipping 36 matching lines @@
     ASSERT_LE(input_pts, kPresentationTimeBase + 2);
   }
   ASSERT_EQ(input_pts, kPresentationTimeBase + 2);
 }
 
 TEST(MediaCodecBridgeTest, InvalidVorbisHeader) {
   if (!MediaCodecBridge::IsAvailable())
     return;
 
   scoped_ptr<media::AudioCodecBridge> media_codec;
-  media_codec.reset(new AudioCodecBridge(kCodecVorbis));
+  media_codec.reset(AudioCodecBridge::Create(kCodecVorbis));
 
   // The first byte of the header is not 0x02.
   uint8 invalid_first_byte[] = { 0x00, 0xff, 0xff, 0xff, 0xff };
   EXPECT_FALSE(media_codec->Start(
       kCodecVorbis, 44100, 2, invalid_first_byte, sizeof(invalid_first_byte),
       false));
 
   // Size of the header does not match with the data we passed in.
   uint8 invalid_size[] = { 0x02, 0x01, 0xff, 0x01, 0xff };
   EXPECT_FALSE(media_codec->Start(
       kCodecVorbis, 44100, 2, invalid_size, sizeof(invalid_size), false));
 
   // Size of the header is too large.
   size_t large_size = 8 * 1024 * 1024 + 2;
   uint8* very_large_header = new uint8[large_size];
   very_large_header[0] = 0x02;
   for (size_t i = 1; i < large_size - 1; ++i)
     very_large_header[i] = 0xff;
   very_large_header[large_size - 1] = 0xfe;
   EXPECT_FALSE(media_codec->Start(
       kCodecVorbis, 44100, 2, very_large_header, 0x80000000, false));
   delete[] very_large_header;
 }
 
+TEST(MediaCodecBridgeTest, CreateUnsupportedCodec) {
+  EXPECT_EQ(NULL, AudioCodecBridge::Create(kUnknownAudioCodec));
+  EXPECT_EQ(NULL, VideoCodecBridge::Create(kUnknownVideoCodec));
+}
+
 }  // namespace media