1 files changed, 15 insertions, 5 deletions

diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index 3e4c051..a24c8aa 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -90,9 +90,10 @@ class ChromotingHostTest : public testing::Test {
     event_executor_ = new MockEventExecutor();
     curtain_ = new MockCurtain();
     disconnect_window_ = new MockDisconnectWindow();
+    local_input_monitor_ = new MockLocalInputMonitor();
     DesktopEnvironment* desktop =
         new DesktopEnvironment(capturer, event_executor_, curtain_,
-                               disconnect_window_);
+                               disconnect_window_, local_input_monitor_);
     MockAccessVerifier* access_verifier = new MockAccessVerifier();
 
     host_ = ChromotingHost::Create(&context_, config_,
@@ -216,6 +217,7 @@ class ChromotingHostTest : public testing::Test {
   MockEventExecutor* event_executor_;
   MockCurtain* curtain_;
   MockDisconnectWindow* disconnect_window_;
+  MockLocalInputMonitor* local_input_monitor_;
 };
 
 TEST_F(ChromotingHostTest, StartAndShutdown) {
@@ -430,7 +432,7 @@ TEST_F(ChromotingHostTest, CurtainModeFailSecond) {
 
 ACTION_P(SetBool, var) { *var = true; }
 
-TEST_F(ChromotingHostTest, CurtainModeMe2Mom) {
+TEST_F(ChromotingHostTest, CurtainModeIT2Me) {
   host_->Start(NewRunnableFunction(&PostQuitTask, &message_loop_));
   host_->set_me2mom(true);
 
@@ -442,7 +444,7 @@ TEST_F(ChromotingHostTest, CurtainModeMe2Mom) {
   bool curtain_activated = false;
   std::string mockJid("user@domain/rest-of-jid");
   {
-    InSequence s;
+    Sequence s1, s2;
     // Can't just expect Times(0) because if it fails then the host will
     // not be shut down and the message loop will never exit.
     EXPECT_CALL(*curtain_, EnableCurtainMode(_))
@@ -450,17 +452,25 @@ TEST_F(ChromotingHostTest, CurtainModeMe2Mom) {
         .WillRepeatedly(SetBool(&curtain_activated));
     EXPECT_CALL(*session_, jid())
         .Times(1)
+        .InSequence(s1)
         .WillOnce(ReturnRef(mockJid));
     EXPECT_CALL(*disconnect_window_, Show(_, "user@domain"))
-        .Times(1);
+        .Times(1)
+        .InSequence(s1);
+    EXPECT_CALL(*local_input_monitor_, Start(_))
+        .Times(1)
+        .InSequence(s2);
     EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
+        .InSequence(s1, s2)
         .WillOnce(DoAll(
             InvokeWithoutArgs(host_.get(), &ChromotingHost::Shutdown),
             RunDoneTask()))
         .RetiresOnSaturation();
     EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
-        .Times(AnyNumber());
+        .Times(AnyNumber())
+        .InSequence(s1, s2);
     EXPECT_CALL(*connection_.get(), Disconnect())
+        .InSequence(s1, s2)
         .RetiresOnSaturation();
   }
   SimulateClientConnection(0, true);