Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

webrtc/modules/desktop_capture/screen_capturer_mock_objects.h

Index: webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
diff --git a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
index 74bf7fc7c3b8c16e8c368bf928f5cf367ec26576..cae8db5eeef595cf002d537a7248a889fc2b6cbb 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
+++ b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
@@ -17,20 +17,8 @@
 
 namespace webrtc {
 
-class MockScreenCapturer : public ScreenCapturer {
- public:
-  MockScreenCapturer() {}
-  virtual ~MockScreenCapturer() {}
-
-  MOCK_METHOD1(Start, void(Callback* callback));
-  MOCK_METHOD0(CaptureFrame, void(void));
-  MOCK_METHOD1(GetScreenList, bool(ScreenList* screens));
-  MOCK_METHOD1(SelectScreen, bool(ScreenId id));
-
- private:
-  RTC_DISALLOW_COPY_AND_ASSIGN(MockScreenCapturer);
-};
-
+// Deprecated.
+// Use webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h.
 class MockScreenCapturerCallback : public ScreenCapturer::Callback {
  public:
   MockScreenCapturerCallback() {}