Remove the dependency to ws2_32.dll from talk_base::ThreadManager and talk_base::Thread.

remoting/protocol/jingle_session_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 "remoting/protocol/jingle_session.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/test/test_timeouts.h"
@@ skipping 63 matching lines @@
 
 class MockStreamChannelCallback {
  public:
   MOCK_METHOD1(OnDone, void(net::StreamSocket* socket));
 };
 
 }  // namespace
 
 class JingleSessionTest : public testing::Test {
  public:
-  JingleSessionTest()
-      : message_loop_(talk_base::Thread::Current()) {
+  JingleSessionTest() {
+    talk_base::ThreadManager::Instance()->WrapCurrentThread();
+    message_loop_.reset(
+        new JingleThreadMessageLoop(talk_base::Thread::Current()));
   }
 
   // Helper method that handles OnIncomingSession().
   void SetHostSession(Session* session) {
     DCHECK(session);
     host_session_.reset(session);
     host_session_->SetStateChangeCallback(
         base::Bind(&MockSessionCallback::OnStateChange,
                    base::Unretained(&host_connection_callback_)));
 
@@ skipping 10 matching lines @@
     host_socket_ = socket.Pass();
   }
 
  protected:
   virtual void SetUp() {
   }
 
   virtual void TearDown() {
     CloseSessions();
     CloseSessionManager();
-    message_loop_.RunAllPending();
+    message_loop_->RunAllPending();
   }
 
   void CloseSessions() {
     host_socket_.reset();
     host_session_.reset();
     client_socket_.reset();
     client_session_.reset();
   }
 
   void CreateSessionManagers(int auth_round_trips,
@@ skipping 90 matching lines @@
 
     scoped_ptr<Authenticator> authenticator(new FakeAuthenticator(
         FakeAuthenticator::CLIENT, auth_round_trips, auth_action, true));
 
     client_session_ = client_server_->Connect(
         kHostJid, authenticator.Pass(),
         CandidateSessionConfig::CreateDefault(),
         base::Bind(&MockSessionCallback::OnStateChange,
                    base::Unretained(&client_connection_callback_)));
 
-    message_loop_.RunAllPending();
+    message_loop_->RunAllPending();
   }
 
   void CreateChannel(bool expect_fail) {
     client_session_->CreateStreamChannel(kChannelName, base::Bind(
         &JingleSessionTest::OnClientChannelCreated, base::Unretained(this)));
     host_session_->CreateStreamChannel(kChannelName, base::Bind(
         &JingleSessionTest::OnHostChannelCreated, base::Unretained(this)));
 
     int counter = 2;
     EXPECT_CALL(client_channel_callback_, OnDone(_))
         .WillOnce(QuitThreadOnCounter(&counter));
     EXPECT_CALL(host_channel_callback_, OnDone(_))
         .WillOnce(QuitThreadOnCounter(&counter));
-    message_loop_.Run();
+    message_loop_->Run();
 
     if (expect_fail) {
       // At least one socket should fail to connect.
       EXPECT_TRUE((!client_socket_.get()) || (!host_socket_.get()));
     } else {
       EXPECT_TRUE(client_socket_.get());
       EXPECT_TRUE(host_socket_.get());
     }
   }
 
-  JingleThreadMessageLoop message_loop_;
+  scoped_ptr<JingleThreadMessageLoop> message_loop_;
 
   scoped_ptr<FakeSignalStrategy> host_signal_strategy_;
   scoped_ptr<FakeSignalStrategy> client_signal_strategy_;
 
   scoped_ptr<JingleSessionManager> host_server_;
   MockSessionManagerListener host_server_listener_;
   scoped_ptr<JingleSessionManager> client_server_;
   MockSessionManagerListener client_server_listener_;
 
   scoped_ptr<Session> host_session_;
@@ skipping 35 matching lines @@
         .Times(1);
   }
 
   scoped_ptr<Authenticator> authenticator(new FakeAuthenticator(
       FakeAuthenticator::CLIENT, 1, FakeAuthenticator::ACCEPT, true));
   client_session_ = client_server_->Connect(
       kHostJid, authenticator.Pass(), CandidateSessionConfig::CreateDefault(),
       base::Bind(&MockSessionCallback::OnStateChange,
                  base::Unretained(&client_connection_callback_)));
 
-  message_loop_.RunAllPending();
+  message_loop_->RunAllPending();
 }
 
 // Verify that we can connect two endpoints with single-step authentication.
 TEST_F(JingleSessionTest, Connect) {
   CreateSessionManagers(1, FakeAuthenticator::ACCEPT);
   InitiateConnection(1, FakeAuthenticator::ACCEPT, false);
 
   // Verify that the client specified correct initiator value.
   ASSERT_GT(host_signal_strategy_->received_messages().size(), 0U);
   const buzz::XmlElement* initiate_xml =
@@ skipping 27 matching lines @@
 TEST_F(JingleSessionTest, TestStreamChannel) {
   CreateSessionManagers(1, FakeAuthenticator::ACCEPT);
   ASSERT_NO_FATAL_FAILURE(
       InitiateConnection(1, FakeAuthenticator::ACCEPT, false));
 
   ASSERT_NO_FATAL_FAILURE(CreateChannel(false));
 
   StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
                                 kMessageSize, kMessages);
   tester.Start();
-  message_loop_.Run();
+  message_loop_->Run();
   tester.CheckResults();
 }
 
 // Verify that we can connect channels with multistep auth.
 TEST_F(JingleSessionTest, TestMultistepAuthStreamChannel) {
   CreateSessionManagers(3, FakeAuthenticator::ACCEPT);
   ASSERT_NO_FATAL_FAILURE(
       InitiateConnection(3, FakeAuthenticator::ACCEPT, false));
 
   ASSERT_NO_FATAL_FAILURE(CreateChannel(false));
 
   StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
                                 kMessageSize, kMessages);
   tester.Start();
-  message_loop_.Run();
+  message_loop_->Run();
   tester.CheckResults();
 }
 
 // Verify that we shutdown properly when channel authentication fails.
 TEST_F(JingleSessionTest, TestFailedChannelAuth) {
   CreateSessionManagers(1, FakeAuthenticator::ACCEPT);
   ASSERT_NO_FATAL_FAILURE(
       InitiateConnection(1, FakeAuthenticator::REJECT_CHANNEL, false));
 
   ASSERT_NO_FATAL_FAILURE(CreateChannel(true));
 }
 
 }  // namespace protocol
 }  // namespace remoting