Tie multibuffers to URLs

media/blink/multibuffer.h

Index: media/blink/multibuffer.h
diff --git a/media/blink/multibuffer.h b/media/blink/multibuffer.h
index 36e484cb745893544bff2fcdbf40fdd3936ab584..6624c515a9880bb816b7c3d7b2b658c1773eee29 100644
--- a/media/blink/multibuffer.h
+++ b/media/blink/multibuffer.h
@@ -56,7 +56,7 @@ const int kMaxWaitForReaderOffset = 50;
 // { url=valid, block_num=1 }                // valid value
 // { url=valid, block_num=10 }               // valid value
 // { url=kUnknownUrlData, block_num=maxint }   // maximum possible value
-class MEDIA_EXPORT MultiBufferBlockId {
+class MEDIA_BLINK_EXPORT MultiBufferBlockId {
  public:
   MultiBufferBlockId();
   MultiBufferBlockId(const MultiBufferBlockId& block_id);
@@ -139,8 +139,8 @@ class MEDIA_EXPORT MultiBufferBlockId {
 }   // namespace media
 
 namespace std {
-MEDIA_EXPORT ostream& operator<<(
-    ostream& o, const media::MultiBufferBlockId& id);
+MEDIA_BLINK_EXPORT ostream& operator<<(ostream& o,
+                                       const media::MultiBufferBlockId& id);
 
 template<>
 class numeric_limits<media::MultiBufferBlockId> {
@@ -169,7 +169,7 @@ namespace media {
 //
 // Users should inherit this class and implement CreateWriter().
 // TODO(hubbe): Make the multibuffer respond to memory pressure.
-class MEDIA_EXPORT MultiBuffer {
+class MEDIA_BLINK_EXPORT MultiBuffer {
  public:
 
   // Interface for clients wishing to read data out of this cache.