Reland 237634 and 237645.

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
@@ skipping 903 matching lines @@
     'browser/renderer_host/media/midi_dispatcher_host.cc',
     'browser/renderer_host/media/midi_dispatcher_host.h',
     'browser/renderer_host/media/midi_host.cc',
     'browser/renderer_host/media/midi_host.h',
     'browser/renderer_host/media/video_capture_buffer_pool.cc',
     'browser/renderer_host/media/video_capture_buffer_pool.h',
     'browser/renderer_host/media/video_capture_controller.cc',
     'browser/renderer_host/media/video_capture_controller.h',
     'browser/renderer_host/media/video_capture_controller_event_handler.cc',
     'browser/renderer_host/media/video_capture_controller_event_handler.h',
+    'browser/renderer_host/media/video_capture_device_impl.cc',
+    'browser/renderer_host/media/video_capture_device_impl.h',
     'browser/renderer_host/media/video_capture_host.cc',
     'browser/renderer_host/media/video_capture_host.h',
     'browser/renderer_host/media/video_capture_manager.cc',
     'browser/renderer_host/media/video_capture_manager.h',
     'browser/renderer_host/media/video_capture_oracle.cc',
     'browser/renderer_host/media/video_capture_oracle.h',
     'browser/renderer_host/media/web_contents_audio_input_stream.cc',
     'browser/renderer_host/media/web_contents_audio_input_stream.h',
     'browser/renderer_host/media/web_contents_capture_util.cc',
     'browser/renderer_host/media/web_contents_capture_util.h',
@@ skipping 423 matching lines @@
         'browser/renderer_host/p2p/socket_host_udp.cc',
         'browser/renderer_host/p2p/socket_host_udp.h',
         'browser/renderer_host/p2p/socket_dispatcher_host.cc',
         'browser/renderer_host/p2p/socket_dispatcher_host.h',
       ],
     }],
     ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
       'sources': [
         'browser/renderer_host/media/desktop_capture_device.cc',
         'browser/renderer_host/media/desktop_capture_device.h',
+        'browser/renderer_host/media/desktop_capture_device_ash.cc',
+        'browser/renderer_host/media/desktop_capture_device_ash.h',
       ],
       'dependencies': [
         '../third_party/webrtc/modules/modules.gyp:desktop_capture',
       ],
       'defines': [
         'ENABLE_SCREEN_CAPTURE=1',
       ],
     }],
     ['OS=="win"', {
       'dependencies': [
@@ skipping 250 matching lines @@
         '../build/linux/system.gyp:dbus',
         '../dbus/dbus.gyp:dbus',
       ],
     }, {  # OS != "linux" or use_dbus==0
       'sources!': [
         'browser/geolocation/wifi_data_provider_linux.cc',
       ],
     }],
   ],
 }