Move content\browser\renderer_host\media to content namespace.

content/browser/renderer_host/media/video_capture_controller.h

Index: content/browser/renderer_host/media/video_capture_controller.h
===================================================================
--- content/browser/renderer_host/media/video_capture_controller.h	(revision 164646)
+++ content/browser/renderer_host/media/video_capture_controller.h	(working copy)
@@ -29,16 +29,14 @@
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
 
-namespace media_stream {
+namespace content {
 class VideoCaptureManager;
-}  // namespace media_stream
 
 class CONTENT_EXPORT VideoCaptureController
     : public base::RefCountedThreadSafe<VideoCaptureController>,
       public media::VideoCaptureDevice::EventHandler {
  public:
-  VideoCaptureController(
-      media_stream::VideoCaptureManager* video_capture_manager);
+  VideoCaptureController(VideoCaptureManager* video_capture_manager);
 
   // Start video capturing and try to use the resolution specified in
   // |params|.
@@ -140,12 +138,14 @@
   // It's accessed only on IO thread.
   bool frame_info_available_;
 
-  media_stream::VideoCaptureManager* video_capture_manager_;
+  VideoCaptureManager* video_capture_manager_;
 
   bool device_in_use_;
-  video_capture::State state_;
+  VideoCaptureState state_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureController);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_