remoting/protocol/message_decoder.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_decoder.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_decoder.cc

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

index 14ee9a356a55efbc11750cfedf5199edb5be32c1..59e78b75cd2ad0d32d312897afe6c3326922933f 100644

--- a/remoting/protocol/message_decoder.cc

+++ b/remoting/protocol/message_decoder.cc

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

#include "net/base/io_buffer.h"

#include "remoting/base/compound_buffer.h"

#include "remoting/proto/internal.pb.h"

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

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

namespace remoting {

namespace protocol {

@@ -61,7 +61,7 @@ bool MessageDecoder::GetPayloadSize(int* size) {

char header[kHeaderSize];

header_buffer.CopyFrom(buffer_, 0, kHeaderSize);

header_buffer.CopyTo(header, kHeaderSize);

- *size = talk_base::GetBE32(header);

+ *size = rtc::GetBE32(header);

buffer_.CropFront(kHeaderSize);

return true;

}