Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/host_extension_session_manager_unittest.cc

Index: remoting/host/host_extension_session_manager_unittest.cc
diff --git a/remoting/host/host_extension_session_manager_unittest.cc b/remoting/host/host_extension_session_manager_unittest.cc
index 53df16af3b8ba6e7af5c99c8945e67563da536d8..f2c875c562ffcd9d21b023156a9537e536d9988e 100644
--- a/remoting/host/host_extension_session_manager_unittest.cc
+++ b/remoting/host/host_extension_session_manager_unittest.cc
@@ -9,7 +9,7 @@
 #include "remoting/proto/control.pb.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
 namespace remoting {
 
@@ -107,7 +107,8 @@ TEST_F(HostExtensionSessionManagerTest, CanWrapVideoCapturer) {
   extension3_.set_steal_video_capturer(true);
   extension_manager.OnNegotiatedCapabilities(&client_stub_, "cap1");
 
-  extension_manager.OnCreateVideoCapturer(scoped_ptr<webrtc::ScreenCapturer>());
+  extension_manager.OnCreateVideoCapturer(
+      scoped_ptr<webrtc::DesktopCapturer>());
 
   EXPECT_FALSE(extension1_.has_wrapped_video_encoder());
   EXPECT_TRUE(extension1_.has_wrapped_video_capturer());
@@ -147,7 +148,8 @@ TEST_F(HostExtensionSessionManagerTest, RespectModifiesVideoPipeline) {
   extension2_.set_steal_video_capturer(true);
   extension_manager.OnNegotiatedCapabilities(&client_stub_, "cap1");
 
-  extension_manager.OnCreateVideoCapturer(scoped_ptr<webrtc::ScreenCapturer>());
+  extension_manager.OnCreateVideoCapturer(
+      scoped_ptr<webrtc::DesktopCapturer>());
   extension_manager.OnCreateVideoEncoder(scoped_ptr<VideoEncoder>());
 
   EXPECT_FALSE(extension1_.has_wrapped_video_encoder());