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

content/browser/renderer_host/media/media_stream_dispatcher_host.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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/media_stream_requester.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/public/browser/browser_message_filter.h"
 
-namespace media_stream {
+namespace content {
 
 // MediaStreamDispatcherHost is a delegate for Media Stream API messages used by
 // MediaStreamImpl. It's the complement of MediaStreamDispatcher
 // (owned by RenderView).
 class CONTENT_EXPORT MediaStreamDispatcherHost
-    : public content::BrowserMessageFilter,
+    : public BrowserMessageFilter,

[tfarina, 2012/10/29 17:41:34]

nit: it does fits into the previous line.

[jam, 2012/10/29 18:14:45]

Done.

       public MediaStreamRequester {
  public:
   explicit MediaStreamDispatcherHost(int render_process_id);
 
   // MediaStreamRequester implementation.
   virtual void StreamGenerated(
       const std::string& label,
       const StreamDeviceInfoArray& audio_devices,
       const StreamDeviceInfoArray& video_devices) OVERRIDE;
   virtual void StreamGenerationFailed(const std::string& label) OVERRIDE;
   virtual void DevicesEnumerated(const std::string& label,
                                  const StreamDeviceInfoArray& devices) OVERRIDE;
   virtual void DeviceOpened(const std::string& label,
                             const StreamDeviceInfo& video_device) OVERRIDE;
 
-  // content::BrowserMessageFilter implementation.
+  // BrowserMessageFilter implementation.
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
   virtual void OnChannelClosing() OVERRIDE;
 
  protected:
   virtual ~MediaStreamDispatcherHost();
 
  private:
   friend class MockMediaStreamDispatcherHost;
 
   void OnGenerateStream(int render_view_id,
                         int page_request_id,
                         const StreamOptions& components,
                         const GURL& security_origin);
   void OnGenerateStreamForDevice(int render_view_id,
                                  int page_request_id,
                                  const StreamOptions& components,
                                  const std::string& device_id,
                                  const GURL& security_origin);
   void OnCancelGenerateStream(int render_view_id,
                               int page_request_id);
   void OnStopGeneratedStream(int render_view_id, const std::string& label);
 
   void OnEnumerateDevices(int render_view_id,
                           int page_request_id,
-                          media_stream::MediaStreamType type,
+                          MediaStreamType type,
                           const GURL& security_origin);
 
   void OnOpenDevice(int render_view_id,
                     int page_request_id,
                     const std::string& device_id,
-                    media_stream::MediaStreamType type,
+                    MediaStreamType type,
                     const GURL& security_origin);
 
   // Returns the media stream manager to forward events to,
   // creating one if needed. It is a virtual function so that the unit tests
   // can inject their own MediaStreamManager.
   virtual MediaStreamManager* GetManager();
 
   int render_process_id_;
 
   struct StreamRequest;
   typedef std::map<std::string, StreamRequest> StreamMap;
   // Streams generated for this host.
   StreamMap streams_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost);
 };
 
-}  // namespace media_stream
+}  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_