Revert of Use CopyOnWriteBuffer instead of Buffer to avoid unnecessary copies.

webrtc/pc/channel.h

Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index 3611602e782fc45e49ca141583c989425c10150a..a7c0a3e67a89a5d91edb015e5e1733f88a1d2147 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -190,10 +190,10 @@
   void FlushRtcpMessages();
 
   // NetworkInterface implementation, called by MediaEngine
-  bool SendPacket(rtc::CopyOnWriteBuffer* packet,
-                  const rtc::PacketOptions& options) override;
-  bool SendRtcp(rtc::CopyOnWriteBuffer* packet,
-                const rtc::PacketOptions& options) override;
+  bool SendPacket(rtc::Buffer* packet,
+                          const rtc::PacketOptions& options) override;
+  bool SendRtcp(rtc::Buffer* packet, const rtc::PacketOptions& options)
+      override;
 
   // From TransportChannel
   void OnWritableState(TransportChannel* channel);
@@ -209,10 +209,10 @@
   bool PacketIsRtcp(const TransportChannel* channel, const char* data,
                     size_t len);
   bool SendPacket(bool rtcp,
-                  rtc::CopyOnWriteBuffer* packet,
+                  rtc::Buffer* packet,
                   const rtc::PacketOptions& options);
-  virtual bool WantsPacket(bool rtcp, const rtc::CopyOnWriteBuffer* packet);
-  void HandlePacket(bool rtcp, rtc::CopyOnWriteBuffer* packet,
+  virtual bool WantsPacket(bool rtcp, rtc::Buffer* packet);
+  void HandlePacket(bool rtcp, rtc::Buffer* packet,
                     const rtc::PacketTime& packet_time);
 
   void EnableMedia_w();
@@ -493,7 +493,7 @@
   bool Init();
 
   virtual bool SendData(const SendDataParams& params,
-                        const rtc::CopyOnWriteBuffer& payload,
+                        const rtc::Buffer& payload,
                         SendDataResult* result);
 
   void StartMediaMonitor(int cms);
@@ -507,8 +507,8 @@
   sigslot::signal2<DataChannel*, const DataMediaInfo&> SignalMediaMonitor;
   sigslot::signal2<DataChannel*, const std::vector<ConnectionInfo>&>
       SignalConnectionMonitor;
-  sigslot::signal3<DataChannel*, const ReceiveDataParams&,
-      const rtc::CopyOnWriteBuffer&> SignalDataReceived;
+  sigslot::signal3<DataChannel*, const ReceiveDataParams&, const rtc::Buffer&>
+      SignalDataReceived;
   // Signal for notifying when the channel becomes ready to send data.
   // That occurs when the channel is enabled, the transport is writable,
   // both local and remote descriptions are set, and the channel is unblocked.
@@ -525,7 +525,7 @@
  private:
   struct SendDataMessageData : public rtc::MessageData {
     SendDataMessageData(const SendDataParams& params,
-                        const rtc::CopyOnWriteBuffer* payload,
+                        const rtc::Buffer* payload,
                         SendDataResult* result)
         : params(params),
           payload(payload),
@@ -534,7 +534,7 @@
     }
 
     const SendDataParams& params;
-    const rtc::CopyOnWriteBuffer* payload;
+    const rtc::Buffer* payload;
     SendDataResult* result;
     bool succeeded;
   };
@@ -549,7 +549,7 @@
           payload(data, len) {
     }
     const ReceiveDataParams params;
-    const rtc::CopyOnWriteBuffer payload;
+    const rtc::Buffer payload;
   };
 
   typedef rtc::TypedMessageData<bool> DataChannelReadyToSendMessageData;
@@ -572,7 +572,7 @@
                                   ContentAction action,
                                   std::string* error_desc);
   virtual void ChangeState();
-  virtual bool WantsPacket(bool rtcp, const rtc::CopyOnWriteBuffer* packet);
+  virtual bool WantsPacket(bool rtcp, rtc::Buffer* packet);
 
   virtual void OnMessage(rtc::Message* pmsg);
   virtual void GetSrtpCryptoSuites(std::vector<int>* crypto_suites) const;