Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/host_extension_session_manager_unittest.cc

 // Copyright 2014 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.
 
 #include "remoting/codec/video_encoder.h"
 #include "remoting/host/fake_host_extension.h"
 #include "remoting/host/host_extension_session_manager.h"
 #include "remoting/host/host_mock_objects.h"
 #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 {
 
 class HostExtensionSessionManagerTest : public testing::Test {
  public:
   HostExtensionSessionManagerTest()
       : extension1_("ext1", "cap1"),
         extension2_("ext2", ""),
         extension3_("ext3", "cap3") {
     extensions_.push_back(&extension1_);
@@ skipping 77 matching lines @@
 TEST_F(HostExtensionSessionManagerTest, CanWrapVideoCapturer) {
   HostExtensionSessionManager extension_manager(extensions_,
                                                 &client_session_control_);
 
   // Set up all the extensions to request to modify the video pipeline.
   extension1_.set_steal_video_capturer(true);
   extension2_.set_steal_video_capturer(true);
   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());
   EXPECT_FALSE(extension2_.has_wrapped_video_encoder());
   EXPECT_TRUE(extension2_.has_wrapped_video_capturer());
   EXPECT_FALSE(extension3_.was_instantiated());
 }
 
 // Verifies that matching extensions are given the opportunity to wrap or
 // replace the video encoders.
@@ skipping 19 matching lines @@
 // Verifies that only extensions which report that they modify the video
 // pipeline actually get called to modify it.
 TEST_F(HostExtensionSessionManagerTest, RespectModifiesVideoPipeline) {
   HostExtensionSessionManager extension_manager(extensions_,
                                                 &client_session_control_);
 
   // Set up the second extension to request to modify the video pipeline.
   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());
   EXPECT_FALSE(extension1_.has_wrapped_video_capturer());
   EXPECT_TRUE(extension2_.has_wrapped_video_encoder());
   EXPECT_TRUE(extension2_.has_wrapped_video_capturer());
   EXPECT_FALSE(extension3_.was_instantiated());
 }
 
 // Verifies that if an extension reports that they modify the video pipeline
 // then ResetVideoPipeline() is called on the ClientSessionControl interface.
 TEST_F(HostExtensionSessionManagerTest, CallsResetVideoPipeline) {
   HostExtensionSessionManager extension_manager(extensions_,
                                                 &client_session_control_);
 
   EXPECT_CALL(client_session_control_, ResetVideoPipeline());
 
   // Set up only the first extension to request to modify the video pipeline.
   extension1_.set_steal_video_capturer(true);
 
   extension_manager.OnNegotiatedCapabilities(&client_stub_, "cap1");
 }
 
 
 }  // namespace remoting