Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(533)

Unified Diff: jingle/glue/chrome_async_socket_unittest.cc

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jingle/glue/chrome_async_socket.cc ('k') | jingle/glue/jingle_glue_mock_objects.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/chrome_async_socket_unittest.cc
diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc
index b3c81b1bbc6e11440d0a8ca743c0d127a4c56399..a26c136d951d697766149113e73b88605c6f7d05 100644
--- a/jingle/glue/chrome_async_socket_unittest.cc
+++ b/jingle/glue/chrome_async_socket_unittest.cc
@@ -23,9 +23,9 @@
#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 {
@@ -431,7 +431,7 @@ class ChromeAsyncSocketTest
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);
@@ -473,9 +473,9 @@ TEST_F(ChromeAsyncSocketTest, DoubleClose) {
}
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);
@@ -485,7 +485,7 @@ TEST_F(ChromeAsyncSocketTest, NoHostnameConnect) {
}
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);
« no previous file with comments | « jingle/glue/chrome_async_socket.cc ('k') | jingle/glue/jingle_glue_mock_objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698