Chromoting: the Me2me host now presents a notification on the console allowing a user to disconnect…

remoting/host/chromoting_host_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "remoting/jingle_glue/mock_objects.h"
 #include "remoting/host/capturer_fake.h"
 #include "remoting/host/chromoting_host.h"
@@ skipping 82 matching lines @@
         capturer.Pass(),
         event_executor.Pass());
 
     host_ = new ChromotingHost(
         &context_, &signal_strategy_, desktop_environment_.get(),
         NetworkSettings());
 
     disconnect_window_ = new MockDisconnectWindow();
     continue_window_ = new MockContinueWindow();
     local_input_monitor_ = new MockLocalInputMonitor();
-    it2me_host_user_interface_.reset(new It2MeHostUserInterface(host_,
-                                                                &context_));
-    it2me_host_user_interface_->InitFrom(
+    it2me_host_user_interface_.reset(new It2MeHostUserInterface(&context_));
+    it2me_host_user_interface_->StartForTest(
+        host_,
+        base::Bind(&ChromotingHost::Shutdown, host_, base::Closure()),
         scoped_ptr<DisconnectWindow>(disconnect_window_),
         scoped_ptr<ContinueWindow>(continue_window_),
         scoped_ptr<LocalInputMonitor>(local_input_monitor_));
 
     session_ = new MockSession();
     session2_ = new MockSession();
     session_config_ = SessionConfig::GetDefault();
     session_jid_ = "user@domain/rest-of-jid";
     session_config2_ = SessionConfig::GetDefault();
     session2_jid_ = "user2@domain/rest-of-jid";
@@ skipping 151 matching lines @@
   message_loop_.Run();
 }
 
 TEST_F(ChromotingHostTest, DISABLED_Connect) {
   host_->Start();
 
   // When the video packet is received we first shutdown ChromotingHost
   // then execute the done task.
   {
     InSequence s;
-    EXPECT_CALL(*disconnect_window_, Show(_, _))
+    EXPECT_CALL(*disconnect_window_, Show(_, _, _))
         .Times(0);
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .WillOnce(DoAll(
             InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost),
             RunDoneTask()))
         .RetiresOnSaturation();
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .Times(AnyNumber());
     EXPECT_CALL(*connection_, Disconnect())
         .RetiresOnSaturation();
   }
   SimulateClientConnection(0, true);
   message_loop_.Run();
 }
 
 TEST_F(ChromotingHostTest, DISABLED_Reconnect) {
   host_->Start();
 
   // When the video packet is received we first disconnect the mock
   // connection.
   {
     InSequence s;
-    EXPECT_CALL(*disconnect_window_, Show(_, _))
+    EXPECT_CALL(*disconnect_window_, Show(_, _, _))
         .Times(0);
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .WillOnce(DoAll(
             InvokeWithoutArgs(this, &ChromotingHostTest::RemoveClientSession),
             RunDoneTask()))
         .RetiresOnSaturation();
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .Times(AnyNumber());
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .Times(AnyNumber());
   }
 
   // If Disconnect() is called we can break the main message loop.
   EXPECT_CALL(*connection_, Disconnect())
       .WillOnce(QuitMainMessageLoop(&message_loop_))
       .RetiresOnSaturation();
 
   SimulateClientConnection(0, true);
   message_loop_.Run();
 
   // Connect the client again.
   {
     InSequence s;
-    EXPECT_CALL(*disconnect_window_, Show(_, _))
+    EXPECT_CALL(*disconnect_window_, Show(_, _, _))
         .Times(0);
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .WillOnce(DoAll(
             InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost),
             RunDoneTask()))
         .RetiresOnSaturation();
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .Times(AnyNumber());
   }
 
   EXPECT_CALL(*connection_, Disconnect())
       .RetiresOnSaturation();
 
   SimulateClientConnection(0, true);
   message_loop_.Run();
 }
 
 TEST_F(ChromotingHostTest, DISABLED_ConnectTwice) {
   host_->Start();
 
   // When a video packet is received we connect the second mock
   // connection.
   {
     InSequence s;
-    EXPECT_CALL(*disconnect_window_, Show(_, _))
+    EXPECT_CALL(*disconnect_window_, Show(_, _, _))
         .Times(0);
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .WillOnce(DoAll(
             InvokeWithoutArgs(
                 CreateFunctor(
                     this,
                     &ChromotingHostTest::SimulateClientConnection, 1, true)),
             RunDoneTask()))
         .RetiresOnSaturation();
-    EXPECT_CALL(*disconnect_window_, Show(_, _))
+    EXPECT_CALL(*disconnect_window_, Show(_, _, _))
         .Times(0);
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .Times(AnyNumber());
     EXPECT_CALL(video_stub2_, ProcessVideoPacketPtr(_, _))
         .WillOnce(DoAll(
             InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost),
             RunDoneTask()))
         .RetiresOnSaturation();
     EXPECT_CALL(video_stub2_, ProcessVideoPacketPtr(_, _))
         .Times(AnyNumber());
   }
 
   EXPECT_CALL(*connection_, Disconnect())
       .RetiresOnSaturation();
   EXPECT_CALL(*connection2_, Disconnect())
       .RetiresOnSaturation();
 
   SimulateClientConnection(0, true);
   message_loop_.Run();
 }
 
 }  // namespace remoting