remoting/protocol/message_serialization.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: remoting/protocol/message_serialization.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: remoting/protocol/message_serialization.cc

diff --git a/remoting/protocol/message_serialization.cc b/remoting/protocol/message_serialization.cc

index 2a22209bf885b1af892746616bfce66605667dad..435baf94cfa8e9bd16593ae2fa7793a635b76b98 100644

--- a/remoting/protocol/message_serialization.cc

+++ b/remoting/protocol/message_serialization.cc

@@ -8,7 +8,7 @@

#include "base/containers/hash_tables.h"

#include "base/logging.h"

#include "net/base/io_buffer.h"

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

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

namespace remoting {

namespace protocol {

@@ -20,7 +20,7 @@ scoped_refptr<net::IOBufferWithSize> SerializeAndFrameMessage(

const int kExtraBytes = sizeof(int32);

int size = msg.ByteSize() + kExtraBytes;

scoped_refptr<net::IOBufferWithSize> buffer(new net::IOBufferWithSize(size));

- talk_base::SetBE32(buffer->data(), msg.GetCachedSize());

+ rtc::SetBE32(buffer->data(), msg.GetCachedSize());

msg.SerializeWithCachedSizesToArray(

reinterpret_cast<uint8*>(buffer->data()) + kExtraBytes);

return buffer;

« no previous file with comments | « remoting/protocol/message_reader_unittest.cc ('k') | remoting/signaling/DEPS » ('j') | no next file with comments »