Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/host_mock_objects.h

 // 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.
 
 #ifndef REMOTING_HOST_HOST_MOCK_OBJECTS_H_
 #define REMOTING_HOST_HOST_MOCK_OBJECTS_H_
 
 #include <string>
 
 #include "net/base/ip_endpoint.h"
@@ skipping 17 matching lines @@
 namespace remoting {
 
 class MockDesktopEnvironment : public DesktopEnvironment {
  public:
   MockDesktopEnvironment();
   virtual ~MockDesktopEnvironment();
 
   MOCK_METHOD0(CreateAudioCapturerPtr, AudioCapturer*());
   MOCK_METHOD0(CreateInputInjectorPtr, InputInjector*());
   MOCK_METHOD0(CreateScreenControlsPtr, ScreenControls*());
-  MOCK_METHOD0(CreateVideoCapturerPtr, webrtc::ScreenCapturer*());
+  MOCK_METHOD0(CreateVideoCapturerPtr, webrtc::DesktopCapturer*());
   MOCK_METHOD0(CreateMouseCursorMonitorPtr, webrtc::MouseCursorMonitor*());
   MOCK_CONST_METHOD0(GetCapabilities, std::string());
   MOCK_METHOD1(SetCapabilities, void(const std::string&));
   MOCK_METHOD1(CreateGnubbyAuthHandlerPtr, GnubbyAuthHandler*(
       protocol::ClientStub* client_stub));
 
   // DesktopEnvironment implementation.
   virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
   virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
   virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
-  virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
+  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE;
   virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
       protocol::ClientStub* client_stub) OVERRIDE;
   virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
       OVERRIDE;
 };
 
 class MockClientSessionControl : public ClientSessionControl {
  public:
   MockClientSessionControl();
   virtual ~MockClientSessionControl();
@@ skipping 99 matching lines @@
   MOCK_METHOD2(Init, void(Callback* callback, Mode mode));
   MOCK_METHOD0(Capture, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockMouseCursorMonitor);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HOST_MOCK_OBJECTS_H_