Revert of ImageCapture: content_browsertest WebRtcImageCaptureBrowserTest CreateAndGetCapabilities

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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 292 matching lines @@
       'browser/accessibility/android_granularity_movement_browsertest.cc',
       'browser/media/session/media_session_delegate_android_browsertest.cc',
       'shell/android/browsertests_apk/content_browser_tests_jni_onload.cc',
     ],
     'content_browsertests_webrtc_sources': [
       'browser/media/webrtc/webrtc_audio_debug_recordings_browsertest.cc',
       'browser/media/webrtc/webrtc_browsertest.cc',
       'browser/media/webrtc/webrtc_browsertest_audio.cc',
       'browser/media/webrtc/webrtc_browsertest_data.cc',
       'browser/media/webrtc/webrtc_capture_from_element_browsertest.cc',
-      'browser/media/webrtc/webrtc_content_browsertest_base.cc',
-      'browser/media/webrtc/webrtc_content_browsertest_base.h',
       'browser/media/webrtc/webrtc_datachannel_browsertest.cc',
       'browser/media/webrtc/webrtc_getusermedia_browsertest.cc',
-      'browser/media/webrtc/webrtc_image_capture_browsertest.cc',
       'browser/media/webrtc/webrtc_internals_browsertest.cc',
       'browser/media/webrtc/webrtc_ip_permissions_browsertest.cc',
       'browser/media/webrtc/webrtc_media_recorder_browsertest.cc',
       'browser/media/webrtc/webrtc_webcam_browsertest.cc',
-      'browser/media/webrtc/webrtc_webcam_browsertest.h',
+      'test/webrtc_content_browsertest_base.cc',
+      'test/webrtc_content_browsertest_base.h',
     ],
     'content_browsertests_plugins_sources': [
       'renderer/pepper/fake_pepper_plugin_instance.cc',
       'renderer/pepper/mock_renderer_ppapi_host.cc',
       'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc',
       'renderer/pepper/pepper_file_chooser_host_unittest.cc',
       'renderer/pepper/pepper_graphics_2d_host_unittest.cc',
       'renderer/pepper/pepper_url_request_unittest.cc',
       'renderer/pepper/pepper_webplugin_impl_browsertest.cc',
       'renderer/pepper/plugin_power_saver_helper_browsertest.cc',
@@ skipping 432 matching lines @@
       'browser/renderer_host/pepper/quota_reservation_unittest.cc',
       'renderer/pepper/event_conversion_unittest.cc',
       'renderer/pepper/host_var_tracker_unittest.cc',
       'renderer/pepper/mock_resource.h',
       'renderer/pepper/pepper_broker_unittest.cc',
       'renderer/pepper/plugin_instance_throttler_impl_unittest.cc',
       'renderer/pepper/v8_var_converter_unittest.cc',
     ],
     # WebRTC-specific sources. Put WebRTC plugin-related stuff further below.
     'content_unittests_webrtc_sources': [
+      'browser/media/webrtc/webrtc_internals_unittest.cc',
       'browser/media/webrtc/webrtc_eventlog_host_unittest.cc',
-      'browser/media/webrtc/webrtc_internals_unittest.cc',
       'browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc',
       'browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
       'browser/renderer_host/p2p/socket_host_test_utils.cc',
       'browser/renderer_host/p2p/socket_host_test_utils.h',
       'browser/renderer_host/p2p/socket_host_udp_unittest.cc',
       'renderer/media/audio_repetition_detector_unittest.cc',
       'renderer/media/audio_track_recorder_unittest.cc',
       'renderer/media/canvas_capture_handler_unittest.cc',
       'renderer/media/gpu/rtc_video_decoder_unittest.cc',
       'renderer/media/html_video_element_capturer_source_unittest.cc',
@@ skipping 1137 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }