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..5fcd72f8ea94c5b603792800ca502dcafeb9b384 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,13 +56,14 @@ 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();
 }
 
 TEST_F(LogToServerTest, SendLater) {
+  log_to_server_->OnClientAuthenticated("client@domain.com/5678");
   {
     InSequence s;
     EXPECT_CALL(signal_strategy_, GetLocalJid())
@@ -73,13 +76,14 @@ TEST_F(LogToServerTest, SendLater) {
         .WillOnce(QuitMainMessageLoop(&message_loop_))
         .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);
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
   message_loop_.Run();
 }
 
 TEST_F(LogToServerTest, SendTwoEntriesLater) {
+  log_to_server_->OnClientAuthenticated("client@domain.com/5678");
+  log_to_server_->OnClientAuthenticated("client2@domain.com/6789");
   {
     InSequence s;
     EXPECT_CALL(signal_strategy_, GetLocalJid())
@@ -92,10 +96,8 @@ TEST_F(LogToServerTest, SendTwoEntriesLater) {
         .WillOnce(QuitMainMessageLoop(&message_loop_))
         .RetiresOnSaturation();
   }
-  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();
 }