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

content/browser/renderer_host/media/video_capture_controller.h

 // Copyright (c) 2012 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.
 
 // VideoCaptureController is the glue between VideoCaptureHost,
 // VideoCaptureManager and VideoCaptureDevice.
 // It provides functions for VideoCaptureHost to start a VideoCaptureDevice and
 // is responsible for keeping track of shared DIBs and filling them with I420
 // video frames for IPC communication between VideoCaptureHost and
 // VideoCaptureMessageFilter.
@@ skipping 11 matching lines @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/process.h"
 #include "base/synchronization/lock.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/common/media/video_capture.h"
 #include "media/video/capture/video_capture.h"
 #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|.
   // When capturing has started, the |event_handler| receives a call OnFrameInfo
   // with resolution that best matches the requested that the video
   // capture device support.
   void StartCapture(const VideoCaptureControllerID& id,
                     VideoCaptureControllerEventHandler* event_handler,
                     base::ProcessHandle render_process,
                     const media::VideoCaptureParams& params);
@@ skipping 81 matching lines @@
   // call per StartCapture().
   media::VideoCaptureCapability frame_info_;
   // Chopped pixels in width/height in case video capture device has odd numbers
   // for width/height.
   int chopped_width_;
   int chopped_height_;
 
   // 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_