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

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 946 matching lines @@
             }],
             ['input_speech==0', {
               'sources/': [
                 ['exclude', '^browser/speech/'],
               ]
             }],
           ],
         },
       ],
     }],
-    ['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',
               '../testing/gtest.gyp:gtest',
               '../media/media.gyp:media',
               '../ui/gl/gl.gyp:gl',
               '../ui/ui.gyp:ui',
             ],
             'include_dirs': [
               '<(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',
                 ],
               }],
               ['OS=="win"', {
                 'dependencies': [
                   '../third_party/angle/src/build_angle.gyp:libEGL',
                   '../third_party/angle/src/build_angle.gyp:libGLESv2',
                 ],
@@ skipping 69 matching lines @@
           'variables': {
             'apk_name': 'content_browsertests',
             'java_in_dir': 'shell/android/browsertests_apk',
             'resource_dir': 'shell/android/browsertests_apk/res',
             'native_lib_target': 'libcontent_browsertests',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(ant_build_out)/content_shell/assets',
           },
           '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"', {
       'targets': [
         {
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
@@ skipping 27 matching lines @@
             'resource_dir': 'shell/android/shell_apk/res',
             'additional_src_dirs': ['public/android/javatests/',],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }