Move signaling connection creation out of ChromotingHost.

remoting/host/log_to_server_unittest.cc

Index: remoting/host/log_to_server_unittest.cc
diff --git a/remoting/host/log_to_server_unittest.cc b/remoting/host/log_to_server_unittest.cc
index 0749163104ed5b005935662e2782729db9315e5a..106ba51243c884b94d09b094fef3d3673559eadd 100644
--- a/remoting/host/log_to_server_unittest.cc
+++ b/remoting/host/log_to_server_unittest.cc
@@ -31,14 +31,16 @@ class LogToServerTest : public testing::Test {
   LogToServerTest() {}
   virtual void SetUp() OVERRIDE {
     message_loop_proxy_ = base::MessageLoopProxy::current();
-    log_to_server_.reset(new LogToServer(message_loop_proxy_));
+    EXPECT_CALL(signal_strategy_, AddListener(_));
+    log_to_server_.reset(new LogToServer(&signal_strategy_));
+    EXPECT_CALL(signal_strategy_, RemoveListener(_));
   }
 
  protected:
-  scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
-  scoped_ptr<LogToServer> log_to_server_;
   MessageLoop message_loop_;
+  scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   MockSignalStrategy signal_strategy_;
+  scoped_ptr<LogToServer> log_to_server_;
 };
 
 TEST_F(LogToServerTest, SendNow) {
@@ -54,9 +56,9 @@ TEST_F(LogToServerTest, SendNow) {
         .WillOnce(QuitMainMessageLoop(&message_loop_))
         .RetiresOnSaturation();
   }
-  log_to_server_->OnSignallingConnected(&signal_strategy_);
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
   log_to_server_->OnClientAuthenticated("client@domain.com/5678");
-  log_to_server_->OnSignallingDisconnected();
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
   message_loop_.Run();
 }
 
@@ -74,8 +76,8 @@ TEST_F(LogToServerTest, SendLater) {
         .RetiresOnSaturation();
   }
   log_to_server_->OnClientAuthenticated("client@domain.com/5678");
-  log_to_server_->OnSignallingConnected(&signal_strategy_);
-  log_to_server_->OnSignallingDisconnected();
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);

[Wez, 2012/01/03 16:25:04]

nit: This test should really verify that the stanza is not sent until CONNECTED
is notified.

[Sergey Ulanov, 2012/01/03 21:51:02]

Done.

+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
   message_loop_.Run();
 }
 
@@ -94,8 +96,8 @@ TEST_F(LogToServerTest, SendTwoEntriesLater) {
   }
   log_to_server_->OnClientAuthenticated("client@domain.com/5678");
   log_to_server_->OnClientAuthenticated("client2@domain.com/6789");
-  log_to_server_->OnSignallingConnected(&signal_strategy_);
-  log_to_server_->OnSignallingDisconnected();
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
   message_loop_.Run();
 }