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

Unified Diff: remoting/host/ipc_desktop_environment_unittest.cc

Issue 13932020: Set the initial resolution of an RDP session to the client screen resolution if it is available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Clang Created 7 years, 8 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/ipc_desktop_environment.cc ('k') | remoting/proto/control.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/ipc_desktop_environment_unittest.cc
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index ec6c257e77c711a188ef76499b0cac8f0dabb084..cd4346f32f274a376d146a17d3f25d9c877dfa46 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -36,6 +36,7 @@
using testing::_;
using testing::AnyNumber;
using testing::AtLeast;
+using testing::AtMost;
using testing::Return;
using testing::ReturnRef;
@@ -277,6 +278,8 @@ void IpcDesktopEnvironmentTest::SetUp() {
// Create the screen capturer.
video_capturer_ =
desktop_environment_->CreateVideoCapturer();
+
+ desktop_environment_->SetCapabilities(std::string());
}
void IpcDesktopEnvironmentTest::ConnectTerminal(
@@ -302,15 +305,19 @@ DesktopEnvironment* IpcDesktopEnvironmentTest::CreateDesktopEnvironment() {
EXPECT_CALL(*desktop_environment, CreateAudioCapturerPtr())
.Times(0);
EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr())
- .Times(AnyNumber())
- .WillRepeatedly(Invoke(
+ .Times(AtMost(1))
+ .WillOnce(Invoke(
this, &IpcDesktopEnvironmentTest::CreateInputInjector));
EXPECT_CALL(*desktop_environment, CreateScreenControlsPtr())
- .Times(AnyNumber());
+ .Times(AtMost(1));
EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr())
- .Times(AnyNumber())
- .WillRepeatedly(Invoke(
+ .Times(AtMost(1))
+ .WillOnce(Invoke(
this, &IpcDesktopEnvironmentTest::CreateVideoCapturer));
+ 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());
« no previous file with comments | « remoting/host/ipc_desktop_environment.cc ('k') | remoting/proto/control.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698