Update webrtc&libjingle 6774:6825.

content/renderer/media/rtc_data_channel_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/rtc_data_channel_handler.h"
 
 #include <limits>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 85 matching lines @@
 unsigned short RtcDataChannelHandler::id() const {
   return channel_->id();
 }
 
 unsigned long RtcDataChannelHandler::bufferedAmount() {
   return channel_->buffered_amount();
 }
 
 bool RtcDataChannelHandler::sendStringData(const blink::WebString& data) {
   std::string utf8_buffer = base::UTF16ToUTF8(data);
-  talk_base::Buffer buffer(utf8_buffer.c_str(), utf8_buffer.length());
+  rtc::Buffer buffer(utf8_buffer.c_str(), utf8_buffer.length());
   webrtc::DataBuffer data_buffer(buffer, false);
   RecordMessageSent(data_buffer.size());
   return channel_->Send(data_buffer);
 }
 
 bool RtcDataChannelHandler::sendRawData(const char* data, size_t length) {
-  talk_base::Buffer buffer(data, length);
+  rtc::Buffer buffer(data, length);
   webrtc::DataBuffer data_buffer(buffer, true);
   RecordMessageSent(data_buffer.size());
   return channel_->Send(data_buffer);
 }
 
 void RtcDataChannelHandler::close() {
   channel_->Close();
 }
 
 void RtcDataChannelHandler::OnStateChange() {
@@ skipping 62 matching lines @@
                                 num_bytes,
                                 1, kMaxBucketSize, kNumBuckets);
   } else {
     UMA_HISTOGRAM_CUSTOM_COUNTS("WebRTC.UnreliableDataChannelMessageSize",
                                 num_bytes,
                                 1, kMaxBucketSize, kNumBuckets);
   }
 }
 
 }  // namespace content