Revert 248045 "Use webrtc::MouseCursorMonitor for cursor shapes"

trunk/src/remoting/host/ipc_desktop_environment_unittest.cc

 // Copyright (c) 2013 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 123 matching lines @@
   DesktopEnvironment* CreateDesktopEnvironment();
 
   // Creates a dummy InputInjector, to mock
   // DesktopEnvironment::CreateInputInjector().
   InputInjector* CreateInputInjector();
 
   // Creates a fake webrtc::ScreenCapturer, to mock
   // DesktopEnvironment::CreateVideoCapturer().
   webrtc::ScreenCapturer* CreateVideoCapturer();
 
-  // Creates a MockMouseCursorMonitor, to mock
-  // DesktopEnvironment::CreateMouseCursorMonitor
-  webrtc::MouseCursorMonitor* CreateMouseCursorMonitor();
-
   void DeleteDesktopEnvironment();
 
   // Forwards |event| to |clipboard_stub_|.
   void ReflectClipboardEvent(const protocol::ClipboardEvent& event);
 
  protected:
   // Creates and starts an instance of desktop process object.
   void CreateDesktopProcess();
 
   // Destroys the desktop process object created by CreateDesktopProcess().
@@ skipping 163 matching lines @@
   EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr())
       .Times(AtMost(1))
       .WillOnce(Invoke(
           this, &IpcDesktopEnvironmentTest::CreateInputInjector));
   EXPECT_CALL(*desktop_environment, CreateScreenControlsPtr())
       .Times(AtMost(1));
   EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr())
       .Times(AtMost(1))
       .WillOnce(Invoke(
           this, &IpcDesktopEnvironmentTest::CreateVideoCapturer));
-  EXPECT_CALL(*desktop_environment, CreateMouseCursorMonitorPtr())
-      .Times(AtMost(1))
-      .WillOnce(Invoke(
-          this, &IpcDesktopEnvironmentTest::CreateMouseCursorMonitor));
   EXPECT_CALL(*desktop_environment, GetCapabilities())
       .Times(AtMost(1));
   EXPECT_CALL(*desktop_environment, SetCapabilities(_))
       .Times(AtMost(1));
 
   // Let tests know that the remote desktop environment is created.
   message_loop_.PostTask(FROM_HERE, setup_run_loop_->QuitClosure());
 
   return desktop_environment;
 }
 
 InputInjector* IpcDesktopEnvironmentTest::CreateInputInjector() {
   EXPECT_TRUE(remote_input_injector_ == NULL);
   remote_input_injector_ = new MockInputInjector();
 
   EXPECT_CALL(*remote_input_injector_, StartPtr(_));
   return remote_input_injector_;
 }
 
 webrtc::ScreenCapturer* IpcDesktopEnvironmentTest::CreateVideoCapturer() {
   return new ScreenCapturerFake();
 }
 
-webrtc::MouseCursorMonitor*
-IpcDesktopEnvironmentTest::CreateMouseCursorMonitor() {
-  return new MockMouseCursorMonitor();
-}
-
 void IpcDesktopEnvironmentTest::DeleteDesktopEnvironment() {
   input_injector_.reset();
   screen_controls_.reset();
   video_capturer_.reset();
 
   // Trigger DisconnectTerminal().
   desktop_environment_.reset();
 }
 
 void IpcDesktopEnvironmentTest::ReflectClipboardEvent(
@@ skipping 288 matching lines @@
   screen_controls_->SetScreenResolution(ScreenResolution(
       webrtc::DesktopSize(100, 100),
       webrtc::DesktopVector(96, 96)));
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 }  // namespace remoting