Update webrtc&libjingle 6774:6825.

jingle/glue/chrome_async_socket_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 "jingle/glue/chrome_async_socket.h"
 
 #include <deque>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_default.h"
 #include "jingle/glue/resolving_client_socket_factory.h"
 #include "net/base/address_list.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "net/http/transport_security_state.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/base/ipaddress.h"
-#include "third_party/libjingle/source/talk/base/sigslot.h"
-#include "third_party/libjingle/source/talk/base/socketaddress.h"
+#include "third_party/webrtc/base/ipaddress.h"
+#include "third_party/webrtc/base/sigslot.h"
+#include "third_party/webrtc/base/socketaddress.h"
 
 namespace jingle_glue {
 
 namespace {
 
 // Data provider that handles reads/writes for ChromeAsyncSocket.
 class AsyncSocketDataProvider : public net::SocketDataProvider {
  public:
   AsyncSocketDataProvider() : has_pending_read_(false) {}
 
@@ skipping 385 matching lines @@
   }
 
   // ChromeAsyncSocket expects a message loop.
   scoped_ptr<base::MessageLoop> message_loop_;
 
   AsyncSocketDataProvider async_socket_data_provider_;
   net::SSLSocketDataProvider ssl_socket_data_provider_;
 
   scoped_ptr<ChromeAsyncSocket> chrome_async_socket_;
   std::deque<SignalSocketState> signal_socket_states_;
-  const talk_base::SocketAddress addr_;
+  const rtc::SocketAddress addr_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeAsyncSocketTest);
 };
 
 TEST_F(ChromeAsyncSocketTest, InitialState) {
   ExpectClosed();
   ExpectNoSignal();
 }
 
@@ skipping 21 matching lines @@
   ExpectClosed();
   ExpectSignalSocketState(
       SignalSocketState::NoError(
           SIGNAL_CLOSE, ChromeAsyncSocket::STATE_CLOSED));
 
   EXPECT_TRUE(chrome_async_socket_->Close());
   ExpectClosed();
 }
 
 TEST_F(ChromeAsyncSocketTest, NoHostnameConnect) {
-  talk_base::IPAddress ip_address;
-  EXPECT_TRUE(talk_base::IPFromString("127.0.0.1", &ip_address));
-  const talk_base::SocketAddress no_hostname_addr(ip_address, addr_.port());
+  rtc::IPAddress ip_address;
+  EXPECT_TRUE(rtc::IPFromString("127.0.0.1", &ip_address));
+  const rtc::SocketAddress no_hostname_addr(ip_address, addr_.port());
   EXPECT_FALSE(chrome_async_socket_->Connect(no_hostname_addr));
   ExpectErrorState(ChromeAsyncSocket::STATE_CLOSED,
                    ChromeAsyncSocket::ERROR_DNS);
 
   EXPECT_TRUE(chrome_async_socket_->Close());
   ExpectClosed();
 }
 
 TEST_F(ChromeAsyncSocketTest, ZeroPortConnect) {
-  const talk_base::SocketAddress zero_port_addr(addr_.hostname(), 0);
+  const rtc::SocketAddress zero_port_addr(addr_.hostname(), 0);
   EXPECT_FALSE(chrome_async_socket_->Connect(zero_port_addr));
   ExpectErrorState(ChromeAsyncSocket::STATE_CLOSED,
                    ChromeAsyncSocket::ERROR_DNS);
 
   EXPECT_TRUE(chrome_async_socket_->Close());
   ExpectClosed();
 }
 
 TEST_F(ChromeAsyncSocketTest, DoubleConnect) {
   EXPECT_DEBUG_DEATH({
@@ skipping 584 matching lines @@
   message_loop_->RunUntilIdle();
 
   ExpectNoSignal();
 
   DoSSLCloseOpenedNoError();
 }
 
 }  // namespace
 
 }  // namespace jingle_glue