1 files changed, 9 insertions, 9 deletions
diff --git a/rtc_base/byte_buffer.cc b/rtc_base/byte_buffer.cc
index e1278337a4..3f0e61e59c 100644
--- a/rtc_base/byte_buffer.cc
+++ b/rtc_base/byte_buffer.cc
@@ -19,23 +19,23 @@ ByteBufferWriter::ByteBufferWriter() : ByteBufferWriterT() {}
 ByteBufferWriter::ByteBufferWriter(const char* bytes, size_t len)
     : ByteBufferWriterT(bytes, len) {}
 
-ByteBufferReader::ByteBufferReader(const char* bytes, size_t len) {
-  Construct(bytes, len);
+ByteBufferReader::ByteBufferReader(rtc::ArrayView<const uint8_t> bytes) {
+  Construct(bytes.data(), bytes.size());
 }
 
-ByteBufferReader::ByteBufferReader(const char* bytes) {
-  Construct(bytes, strlen(bytes));
+ByteBufferReader::ByteBufferReader(const char* bytes, size_t len) {
+  Construct(reinterpret_cast<const uint8_t*>(bytes), len);
 }
 
-ByteBufferReader::ByteBufferReader(const Buffer& buf) {
-  Construct(buf.data<char>(), buf.size());
+ByteBufferReader::ByteBufferReader(const char* bytes) {
+  Construct(reinterpret_cast<const uint8_t*>(bytes), strlen(bytes));
 }
 
 ByteBufferReader::ByteBufferReader(const ByteBufferWriter& buf) {
-  Construct(buf.Data(), buf.Length());
+  Construct(reinterpret_cast<const uint8_t*>(buf.Data()), buf.Length());
 }
 
-void ByteBufferReader::Construct(const char* bytes, size_t len) {
+void ByteBufferReader::Construct(const uint8_t* bytes, size_t len) {
   bytes_ = bytes;
   size_ = len;
   start_ = 0;
@@ -134,7 +134,7 @@ bool ByteBufferReader::ReadString(std::string* val, size_t len) {
   if (len > Length()) {
     return false;
   } else {
-    val->append(bytes_ + start_, len);
+    val->append(reinterpret_cast<const char*>(bytes_ + start_), len);
     start_ += len;
     return true;
   }