jingle/glue/chrome_async_socket.cc - Issue 429113002: Webrtc deps roll.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: jingle/glue/chrome_async_socket.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:

Index: jingle/glue/chrome_async_socket.cc

diff --git a/jingle/glue/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc

index 2c9812c27a71775c7d1f7921224c02b11d3284c7..dc42e7e58508ee2ff0420fa6eef8853817f3a8aa 100644

--- a/jingle/glue/chrome_async_socket.cc

+++ b/jingle/glue/chrome_async_socket.cc

@@ -22,7 +22,7 @@

#include "net/socket/ssl_client_socket.h"

#include "net/socket/tcp_client_socket.h"

#include "net/ssl/ssl_config_service.h"

-#include "third_party/libjingle/source/talk/base/socketaddress.h"

+#include "third_party/webrtc/base/socketaddress.h"

namespace jingle_glue {

@@ -84,7 +84,7 @@ void ChromeAsyncSocket::DoNetErrorFromStatus(int status) {

// STATE_CLOSED -> STATE_CONNECTING

-bool ChromeAsyncSocket::Connect(const talk_base::SocketAddress& address) {

+bool ChromeAsyncSocket::Connect(const rtc::SocketAddress& address) {

if (state_ != STATE_CLOSED) {

LOG(DFATAL) << "Connect() called on non-closed socket";

DoNonNetError(ERROR_WRONGSTATE);

« no previous file with comments | « jingle/glue/chrome_async_socket.h ('k') | jingle/glue/chrome_async_socket_unittest.cc » ('j') | no next file with comments »