Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: remoting/host/client_session_unittest.cc

Issue 10915264: [remoting_unittests] Moving the variable used to mock VideoFrameCapturer::size_most_recent() to the… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_session_unittest.cc
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index f098a18f4078c22e1993f024ed511f19ce97f435..6192705f2d36159bd17faafeca46dc2c081de758 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -68,9 +68,9 @@ class ClientSessionTest : public testing::Test {
scoped_ptr<VideoFrameCapturer>(capturer_)));
// Set up a large default screen size that won't affect most tests.
- default_screen_size_.set(1000, 1000);
+ screen_size_.set(1000, 1000);
EXPECT_CALL(*capturer_, size_most_recent())
- .WillRepeatedly(ReturnRef(default_screen_size_));
+ .WillRepeatedly(ReturnRef(screen_size_));
session_config_ = SessionConfig::GetDefault();
@@ -126,7 +126,7 @@ class ClientSessionTest : public testing::Test {
MessageLoop message_loop_;
scoped_refptr<AutoThreadTaskRunner> ui_task_runner_;
MockChromotingHostContext context_;
- SkISize default_screen_size_;
+ SkISize screen_size_;
std::string client_jid_;
MockHostStub host_stub_;
MockEventExecutor* event_executor_;
@@ -324,9 +324,7 @@ TEST_F(ClientSessionTest, RestoreEventState) {
}
TEST_F(ClientSessionTest, ClampMouseEvents) {
- SkISize screen(SkISize::Make(200, 100));
- EXPECT_CALL(*capturer_, size_most_recent())
- .WillRepeatedly(ReturnRef(screen));
+ screen_size_.set(200, 100);
EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_));
EXPECT_CALL(*event_executor_, StartPtr(_));
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698