Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/host_mock_objects.cc

Index: remoting/host/host_mock_objects.cc
diff --git a/remoting/host/host_mock_objects.cc b/remoting/host/host_mock_objects.cc
index aad673d7d4a0d995e40c12d0e5b0e530ab7c31e0..775314ce66fc54fa9dd1939b9078850e32cf7920 100644
--- a/remoting/host/host_mock_objects.cc
+++ b/remoting/host/host_mock_objects.cc
@@ -14,7 +14,7 @@
 #include "remoting/host/input_injector.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/transport.h"
-#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
 namespace remoting {
 
@@ -34,9 +34,9 @@ scoped_ptr<ScreenControls> MockDesktopEnvironment::CreateScreenControls() {
   return scoped_ptr<ScreenControls>(CreateScreenControlsPtr());
 }
 
-scoped_ptr<webrtc::ScreenCapturer>
+scoped_ptr<webrtc::DesktopCapturer>
 MockDesktopEnvironment::CreateVideoCapturer() {
-  return scoped_ptr<webrtc::ScreenCapturer>(CreateVideoCapturerPtr());
+  return scoped_ptr<webrtc::DesktopCapturer>(CreateVideoCapturerPtr());
 }
 
 scoped_ptr<GnubbyAuthHandler>