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

remoting/host/chromoting_host_unittest.cc

Index: remoting/host/chromoting_host_unittest.cc
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index 78401ee731cffc3b77bf365e4873174b7e5abc54..b2b1bae8b65a137d3cd3bea356f56f8efab6148a 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -100,9 +100,10 @@ class ChromotingHostTest : public testing::Test {
     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_));
@@ -274,7 +275,7 @@ TEST_F(ChromotingHostTest, DISABLED_Connect) {
   // 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(
@@ -297,7 +298,7 @@ TEST_F(ChromotingHostTest, DISABLED_Reconnect) {
   // connection.
   {
     InSequence s;
-    EXPECT_CALL(*disconnect_window_, Show(_, _))
+    EXPECT_CALL(*disconnect_window_, Show(_, _, _))
         .Times(0);
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .WillOnce(DoAll(
@@ -321,7 +322,7 @@ TEST_F(ChromotingHostTest, DISABLED_Reconnect) {
   // 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(
@@ -346,7 +347,7 @@ TEST_F(ChromotingHostTest, DISABLED_ConnectTwice) {
   // connection.
   {
     InSequence s;
-    EXPECT_CALL(*disconnect_window_, Show(_, _))
+    EXPECT_CALL(*disconnect_window_, Show(_, _, _))
         .Times(0);
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
         .WillOnce(DoAll(
@@ -356,7 +357,7 @@ TEST_F(ChromotingHostTest, DISABLED_ConnectTwice) {
                     &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());