Migrate webkit/renderer/media/ to content/renderer/media/.

content/renderer/media/webmediaplayer_ms.h

Index: content/renderer/media/webmediaplayer_ms.h
diff --git a/webkit/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
similarity index 95%
rename from webkit/renderer/media/webmediaplayer_ms.h
rename to content/renderer/media/webmediaplayer_ms.h
index d27077fb840ea5163bca43c91937de75e1445df6..106e0bcf43b8341b9d2442ce583804c9cc300516 100644
--- a/webkit/renderer/media/webmediaplayer_ms.h
+++ b/content/renderer/media/webmediaplayer_ms.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
-#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
+#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
+#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -28,8 +28,7 @@ namespace webkit {
 class WebLayerImpl;
 }
 
-namespace webkit_media {
-
+namespace content {
 class MediaStreamAudioRenderer;
 class MediaStreamClient;
 class VideoFrameProvider;
@@ -153,7 +152,9 @@ class WebMediaPlayerMS
   base::WeakPtr<WebMediaPlayerDelegate> delegate_;
 
   MediaStreamClient* media_stream_client_;
-  scoped_refptr<webkit_media::VideoFrameProvider> video_frame_provider_;
+
+  // Specify content:: to disambiguate from cc::.
+  scoped_refptr<content::VideoFrameProvider> video_frame_provider_;
   bool paused_;
 
   // |current_frame_| is updated only on main thread. The object it holds
@@ -187,6 +188,6 @@ class WebMediaPlayerMS
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
 };
 
-}  // namespace webkit_media
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
+#endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_