Revert of Enable H.264 video WebRTC behind run-time flag and add WebRtcBrowserTest for H.264

content/content.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
     'chromium_enable_vtune_jit_for_v8%': 0,  # enable the vtune support for V8 engine.
     'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)',
   },
   'target_defaults': {
     'defines': ['CONTENT_IMPLEMENTATION'],
     'conditions': [
       # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
       ['OS=="win" and target_arch=="x64"', {
         'msvs_settings': {
           'VCCLCompilerTool': {
             'AdditionalOptions': ['/bigobj'],
           },
         },
       }],
     ],
   },
   'targets': [
     {
-      # GN version: //content/public/common:common_features
-      'target_name': 'common_features',
+      # GN version: //content/renderer:renderer_features
+      'target_name': 'renderer_features',
       'includes': [
         '../build/buildflag_header.gypi',
         '../third_party/webrtc/build/common.gypi',
       ],
       'conditions': [
         # This conditional looks insane, but without it |rtc_use_h264| is not
         # recognized as defined. Might have something to do with scopes. Moving
         # the inclusion of third_party/webrtc/build/common.gypi to outside of
         # 'targets' is not an option, then we get compile errors.
         # TODO(hbos): crbug.com/584219
         ['1==1', {
           'variables': {
-            'buildflag_header_path': 'content/public/common/common_features.h',
+            'buildflag_header_path': 'content/renderer/renderer_features.h',
             'buildflag_flags': [
               'RTC_USE_H264=<(rtc_use_h264)',
             ],
           },
         }],
       ],
     },
-    {
-      # GN version: //content/public/common:feature_h264_with_openh264_ffmpeg
-      'target_name': 'feature_h264_with_openh264_ffmpeg',
-      'type': 'static_library',
-      'include_dirs': [ '<@(DEPTH)' ],
-      'deps': [
-        ':common_features',
-      ],
-      'sources': [
-        'public/common/feature_h264_with_openh264_ffmpeg.cc',
-        'public/common/feature_h264_with_openh264_ffmpeg.h',
-      ],
-    },
   ],
   'conditions': [
     ['OS != "ios"', {
       'includes': [
         '../build/win_precompile.gypi',
         'content_resources.gypi',
       ],
     }],
     ['OS == "win"', {
       'targets': [
@@ skipping 220 matching lines @@
             {
               # GN version: //content/renderer and //content/public/renderer
               'target_name': 'content_renderer',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
               'includes': [
                 'content_renderer.gypi',
               ],
               'dependencies': [
                 '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
-                'common_features',
                 'content_child',
                 'content_common',
                 'content_resources',
+                'renderer_features',
               ],
               'export_dependent_settings': [
                 'content_common',
               ],
               'conditions': [
                 ['chromium_enable_vtune_jit_for_v8==1', {
                   'dependencies': [
                     '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
                   ],
                 }],
@@ skipping 19 matching lines @@
     },
     {  # component != static_library
       'targets': [
         {
           # GN version: //content
           'target_name': 'content',
           'type': 'shared_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
-            'common_features',
             'content_resources',
+            'renderer_features',
           ],
           'conditions': [
             ['chromium_enable_vtune_jit_for_v8==1', {
               'dependencies': [
                 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
               ],
             }],
           ],
           'includes': [
             'content_app.gypi',
@@ skipping 334 matching lines @@
           },
           'includes': [
             '../build/android/copy_ex.gypi',
             '../build/android/v8_external_startup_data_arch_suffix.gypi',
           ],
         },
       ],
     }],  # OS == "android"
   ],
 }