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

Unified Diff: remoting/protocol/message_serialization.cc

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 | « remoting/protocol/message_reader_unittest.cc ('k') | remoting/signaling/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/message_serialization.cc
diff --git a/remoting/protocol/message_serialization.cc b/remoting/protocol/message_serialization.cc
index 435baf94cfa8e9bd16593ae2fa7793a635b76b98..2a22209bf885b1af892746616bfce66605667dad 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/webrtc/base/byteorder.h"
+#include "third_party/libjingle/source/talk/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));
- rtc::SetBE32(buffer->data(), msg.GetCachedSize());
+ talk_base::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 »

Powered by Google App Engine
This is Rietveld 408576698