summaryrefslogtreecommitdiffstats
path: root/remoting/host/client_session_unittest.cc
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-30 20:35:26 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-30 20:35:26 +0000
commitbcad2686e10ff2ff31c21e2cc77bd1cee6482e9e (patch)
tree6000696a564ee1d3c005c63947d38e9486d75143 /remoting/host/client_session_unittest.cc
parenta31de5292f5facfeec460cd2defc0b131851fb7a (diff)
downloadchromium_src-bcad2686e10ff2ff31c21e2cc77bd1cee6482e9e.zip
chromium_src-bcad2686e10ff2ff31c21e2cc77bd1cee6482e9e.tar.gz
chromium_src-bcad2686e10ff2ff31c21e2cc77bd1cee6482e9e.tar.bz2
Move us fully from gfx:: over to skia types for consistency.
BUG=92085 TEST=BUILD Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=103523 Review URL: http://codereview.chromium.org/7992011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/client_session_unittest.cc')
-rw-r--r--remoting/host/client_session_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index cd621e8..be66a80 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -45,7 +45,7 @@ class ClientSessionTest : public testing::Test {
EXPECT_CALL(*connection_, session()).WillRepeatedly(Return(&session_));
// Set up a large default screen size that won't affect most tests.
- default_screen_size_.SetSize(1000, 1000);
+ default_screen_size_.set(1000, 1000);
ON_CALL(capturer_, size_most_recent()).WillByDefault(ReturnRef(
default_screen_size_));
@@ -59,7 +59,7 @@ class ClientSessionTest : public testing::Test {
}
protected:
- gfx::Size default_screen_size_;
+ SkISize default_screen_size_;
MessageLoop message_loop_;
std::string client_jid_;
MockSession session_;
@@ -170,12 +170,12 @@ TEST_F(ClientSessionTest, LocalInputTest) {
// This event should get through to the input stub.
client_session_->InjectMouseEvent(mouse_event1);
// This one should too because the local event echoes the remote one.
- client_session_->LocalMouseMoved(gfx::Point(mouse_event1.x(),
- mouse_event1.y()));
+ client_session_->LocalMouseMoved(SkIPoint::Make(mouse_event1.x(),
+ mouse_event1.y()));
client_session_->InjectMouseEvent(mouse_event2);
// This one should not.
- client_session_->LocalMouseMoved(gfx::Point(mouse_event1.x(),
- mouse_event1.y()));
+ client_session_->LocalMouseMoved(SkIPoint::Make(mouse_event1.x(),
+ mouse_event1.y()));
client_session_->InjectMouseEvent(mouse_event3);
// TODO(jamiewalch): Verify that remote inputs are re-enabled eventually
// (via dependency injection, not sleep!)
@@ -208,7 +208,7 @@ TEST_F(ClientSessionTest, RestoreEventState) {
}
TEST_F(ClientSessionTest, ClampMouseEvents) {
- gfx::Size screen(200, 100);
+ SkISize screen(SkISize::Make(200, 100));
EXPECT_CALL(capturer_, size_most_recent())
.WillRepeatedly(ReturnRef(screen));