Tie multibuffers to URLs

media/blink/webmediaplayer_util.h

Index: media/blink/webmediaplayer_util.h
diff --git a/media/blink/webmediaplayer_util.h b/media/blink/webmediaplayer_util.h
index 9182f8a9733be1abeb0bb4768a473abe0c6771b1..daa5599b83443d9d7cf7c384859abd67e3188365 100644
--- a/media/blink/webmediaplayer_util.h
+++ b/media/blink/webmediaplayer_util.h
@@ -8,9 +8,9 @@
 #include "base/time/time.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/eme_constants.h"
-#include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/ranges.h"
+#include "media/blink/media_blink_export.h"
 #include "third_party/WebKit/public/platform/WebCallbacks.h"
 #include "third_party/WebKit/public/platform/WebEncryptedMediaTypes.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
@@ -20,31 +20,31 @@
 
 namespace media {
 
-blink::WebTimeRanges MEDIA_EXPORT ConvertToWebTimeRanges(
-    const Ranges<base::TimeDelta>& ranges);
+blink::WebTimeRanges MEDIA_BLINK_EXPORT
+ConvertToWebTimeRanges(const Ranges<base::TimeDelta>& ranges);
 
-blink::WebMediaPlayer::NetworkState MEDIA_EXPORT PipelineErrorToNetworkState(
-    PipelineStatus error);
+blink::WebMediaPlayer::NetworkState MEDIA_BLINK_EXPORT
+PipelineErrorToNetworkState(PipelineStatus error);
 
 // Report various metrics to UMA and RAPPOR.
-void MEDIA_EXPORT ReportMetrics(blink::WebMediaPlayer::LoadType load_type,
-                                const GURL& url,
-                                const GURL& origin_url);
+void MEDIA_BLINK_EXPORT ReportMetrics(blink::WebMediaPlayer::LoadType load_type,
+                                      const GURL& url,
+                                      const GURL& origin_url);
 
 // Record a RAPPOR metric for the origin of an HLS playback.
-void MEDIA_EXPORT RecordOriginOfHLSPlayback(const GURL& origin_url);
+void MEDIA_BLINK_EXPORT RecordOriginOfHLSPlayback(const GURL& origin_url);
 
 // Convert Initialization Data Types.
-EmeInitDataType MEDIA_EXPORT
+EmeInitDataType MEDIA_BLINK_EXPORT
 ConvertToEmeInitDataType(blink::WebEncryptedMediaInitDataType init_data_type);
-blink::WebEncryptedMediaInitDataType MEDIA_EXPORT
+blink::WebEncryptedMediaInitDataType MEDIA_BLINK_EXPORT
 ConvertToWebInitDataType(EmeInitDataType init_data_type);
 
 typedef blink::WebCallbacks<void, blink::WebSetSinkIdError*> WebSetSinkIdCB;
 
 // Wraps a WebSetSinkIdCB into a media::SwitchOutputDeviceCB
 // and binds it to the current thread
-SwitchOutputDeviceCB MEDIA_EXPORT
+SwitchOutputDeviceCB MEDIA_BLINK_EXPORT
 ConvertToSwitchOutputDeviceCB(WebSetSinkIdCB* web_callbacks);
 
 }  // namespace media