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

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 5f6bc275ce5544c709b99d52dbca8cb04f5ed760..4c3e2e8147d88ec7416ccc445292352f90e1b75b 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -994,13 +994,11 @@
         },
       ],
     }],
-    ['chromeos==1 or OS=="win"', {
-      # TODO(felipeg): Make video_decode_accelerator_unittest work on Android.
-      # http://crbug.com/178647
+    ['chromeos==1 or OS=="win" or OS=="android"', {
       'targets': [
           {
             'target_name': 'video_decode_accelerator_unittest',
-            'type': 'executable',
+            'type': '<(gtest_target_type)',
             'dependencies': [
               'content',
               '../base/base.gyp:base',
@@ -1013,11 +1011,28 @@
               '<(DEPTH)/third_party/khronos',
             ],
             'sources': [
+              'common/gpu/media/android_video_decode_accelerator_unittest.cc',
               'common/gpu/media/rendering_helper.h',
               'common/gpu/media/rendering_helper_gl.cc',
               'common/gpu/media/video_decode_accelerator_unittest.cc',
             ],
             'conditions': [
+              ['OS=="android"', {
+                'sources/': [
+                  ['exclude', '^common/gpu/media/rendering_helper.h'],
+                  ['exclude', '^common/gpu/media/rendering_helper_gl.cc'],
+                  ['exclude', '^common/gpu/media/video_decode_accelerator_unittest.cc'],
+                ],
+                'dependencies': [
+                  '../testing/gmock.gyp:gmock',
+                  '../testing/android/native_test.gyp:native_test_native_code',
+                  '../gpu/gpu.gyp:gpu_unittest_utils',
+                ],
+              }, { # OS!="android"
+                'sources/': [
+                  ['exclude', '^common/gpu/media/android_video_decode_accelerator_unittest.cc'],
+                ],
+              }],
               ['target_arch=="arm"', {
                 'include_dirs': [
                   '<(DEPTH)/third_party/openmax/il',
@@ -1107,6 +1122,18 @@
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
+        {
+          'target_name': 'video_decode_accelerator_unittest_apk',
+          'type': 'none',
+          'dependencies': [
+            'video_decode_accelerator_unittest',
+          ],
+          'variables': {
+            'test_suite_name': 'video_decode_accelerator_unittest',
+            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
       ],
     }],
     ['OS == "android"', {