Switch DesktopEnvironment to return a DesktopCapturer.

remoting/remoting_test.gypi

Index: remoting/remoting_test.gypi
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
index 656de77a4d7aad1fe302ff712398c8cbecb04e4a..70d5f9f016b87f9b798d2932e7e792da2933532d 100644
--- a/remoting/remoting_test.gypi
+++ b/remoting/remoting_test.gypi
@@ -19,11 +19,11 @@
         'remoting_resources',
       ],
       'sources': [
+        'host/fake_desktop_capturer.cc',
+        'host/fake_desktop_capturer.h',
         'host/fake_desktop_environment.cc',
         'host/fake_desktop_environment.h',
         'host/fake_host_status_monitor.h',
-        'host/fake_screen_capturer.cc',
-        'host/fake_screen_capturer.h',
         'host/fake_mouse_cursor_monitor.cc',
         'host/fake_mouse_cursor_monitor.h',
         'host/policy_hack/fake_policy_watcher.cc',
@@ -127,11 +127,11 @@
         'host/daemon_process_unittest.cc',
         'host/desktop_process_unittest.cc',
         'host/desktop_shape_tracker_unittest.cc',
+        'host/fake_desktop_capturer.cc',
+        'host/fake_desktop_capturer.h',
         'host/fake_host_extension.cc',
         'host/fake_host_extension.h',
         'host/fake_host_status_monitor.h',
-        'host/fake_screen_capturer.cc',
-        'host/fake_screen_capturer.h',
         'host/gnubby_auth_handler_posix_unittest.cc',
         'host/heartbeat_sender_unittest.cc',
         'host/host_change_notification_listener_unittest.cc',
@@ -162,7 +162,7 @@
         'host/setup/me2me_native_messaging_host_unittest.cc',
         'host/setup/oauth_helper_unittest.cc',
         'host/setup/pin_validator_unittest.cc',
-        'host/shaped_screen_capturer_unittest.cc',
+        'host/shaped_desktop_capturer_unittest.cc',
         'host/token_validator_factory_impl_unittest.cc',
         'host/video_frame_recorder_unittest.cc',
         'host/video_scheduler_unittest.cc',