Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea

1 files changed, 13 insertions, 2 deletions

diff --git a/media/cast/cast_config.h b/media/cast/cast_config.h
index 988924aab4..199891de4b 100644
--- a/media/cast/cast_config.h
+++ b/media/cast/cast_config.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_CAST_CAST_CONFIG_H_
 #define MEDIA_CAST_CAST_CONFIG_H_
 
+#include <list>
 #include <string>
 #include <vector>
 
@@ -172,10 +173,16 @@ struct EncodedAudioFrame {
   std::vector<uint8> data;
 };
 
+typedef std::vector<uint8> Packet;
+typedef std::vector<Packet> PacketList;
+
 class PacketSender {
  public:
-  // All packets to be sent to the network will be delivered via this function.
-  virtual bool SendPacket(const uint8* packet, int length) = 0;
+  // All packets to be sent to the network will be delivered via these
+  // functions.
+  virtual bool SendPackets(const PacketList& packets) = 0;
+
+  virtual bool SendPacket(const Packet& packet) = 0;
 
   virtual ~PacketSender() {}
 };
@@ -187,7 +194,11 @@ class PacketReceiver : public base::RefCountedThreadSafe<PacketReceiver> {
   virtual void ReceivedPacket(const uint8* packet, int length,
                               const base::Closure callback) = 0;
 
+ protected:
   virtual ~PacketReceiver() {}
+
+ private:
+  friend class base::RefCountedThreadSafe<PacketReceiver>;
 };
 
 class VideoEncoderController {