diff options
author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 05:52:07 +0000 |
---|---|---|
committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 05:52:07 +0000 |
commit | 68e103af1202ad37deaf6b4a23334cad0ec71f52 (patch) | |
tree | c393fa5753420799c80f0e867b562d836ddaff7d /remoting/host/chromoting_host_unittest.cc | |
parent | c0c789a71c85025325d2e3d95a0fbb277e34dbb5 (diff) | |
download | chromium_src-68e103af1202ad37deaf6b4a23334cad0ec71f52.zip chromium_src-68e103af1202ad37deaf6b4a23334cad0ec71f52.tar.gz chromium_src-68e103af1202ad37deaf6b4a23334cad0ec71f52.tar.bz2 |
Revert 248045 "Use webrtc::MouseCursorMonitor for cursor shapes"
> Use webrtc::MouseCursorMonitor for cursor shapes
>
> Use webrtc::MouseCursorMonitor for cursor shapes instead of
> webrtc::VideoFrameCapturer, in preparation for deprecating cursor shape
> functionality in the latter.
>
> BUG=324033
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247689
>
> Review URL: https://codereview.chromium.org/92473002
This caused errors on a windows memory bot. See bug for details.
TBR=dcaiafa@chromium.org
Review URL: https://codereview.chromium.org/151163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_host_unittest.cc')
-rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index 7e5f599..1410371 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -245,9 +245,6 @@ class ChromotingHostTest : public testing::Test { EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr()) .Times(AtMost(1)) .WillOnce(Invoke(this, &ChromotingHostTest::CreateVideoCapturer)); - EXPECT_CALL(*desktop_environment, CreateMouseCursorMonitorPtr()) - .Times(AtMost(1)) - .WillOnce(Invoke(this, &ChromotingHostTest::CreateMouseCursorMonitor)); EXPECT_CALL(*desktop_environment, GetCapabilities()) .Times(AtMost(1)); EXPECT_CALL(*desktop_environment, SetCapabilities(_)) @@ -270,12 +267,6 @@ class ChromotingHostTest : public testing::Test { return new ScreenCapturerFake(); } - // Creates a MockMouseCursorMonitor, to mock - // DesktopEnvironment::CreateMouseCursorMonitor(). - webrtc::MouseCursorMonitor* CreateMouseCursorMonitor() { - return new MockMouseCursorMonitor(); - } - void DisconnectAllClients() { host_->DisconnectAllClients(); } |