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

content/renderer/media/webmediaplayer_ms.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "cc/layers/video_frame_provider.h"
 #include "media/filters/skcanvas_video_renderer.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/web/WebMediaPlayer.h"
 #include "url/gurl.h"
 
 namespace WebKit {
 class WebFrame;
 class WebMediaPlayerClient;
 }
 
 namespace media {
 class MediaLog;
 }
 
 namespace webkit {
 class WebLayerImpl;
 }
 
-namespace webkit_media {
-
+namespace content {
 class MediaStreamAudioRenderer;
 class MediaStreamClient;
 class VideoFrameProvider;
 class WebMediaPlayerDelegate;
 
 // WebMediaPlayerMS delegates calls from WebCore::MediaPlayerPrivate to
 // Chrome's media player when "src" is from media stream.
 //
 // WebMediaPlayerMS works with multiple objects, the most important ones are:
 //
@@ skipping 103 matching lines @@
   WebKit::WebTimeRanges buffered_;
 
   // Used for DCHECKs to ensure methods calls executed in the correct thread.
   base::ThreadChecker thread_checker_;
 
   WebKit::WebMediaPlayerClient* client_;
 
   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
   // can be freed on the compositor thread if it is the last to hold a
   // reference but media::VideoFrame is a thread-safe ref-pointer.
   scoped_refptr<media::VideoFrame> current_frame_;
   // |current_frame_used_| is updated on both main and compositing thread.
   // It's used to track whether |current_frame_| was painted for detecting
   // when to increase |dropped_frame_count_|.
   bool current_frame_used_;
@@ skipping 13 matching lines @@
   unsigned dropped_frame_count_;
   media::SkCanvasVideoRenderer video_renderer_;
 
   scoped_refptr<MediaStreamAudioRenderer> audio_renderer_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
 };
 
-}  // namespace webkit_media
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
+#endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_