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

content/common/media/media_stream_options.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_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "content/common/content_export.h"
 #include "content/public/common/media_stream_request.h"
 
-namespace media_stream {
+namespace content {
 
 // MediaStreamConstraint keys for constraints that are passed to getUserMedia.
 CONTENT_EXPORT extern const char kMediaStreamSource[];
 CONTENT_EXPORT extern const char kMediaStreamSourceId[];
 CONTENT_EXPORT extern const char kMediaStreamSourceTab[];
 
-typedef content::MediaStreamDeviceType MediaStreamType;
+typedef MediaStreamDeviceType MediaStreamType;
 
 // Callback to deliver the result of a media request. |label| is the string
 // to identify the request,
-typedef base::Callback< void(const std::string&,
-                             const content::MediaStreamDevices&) >
+typedef base::Callback< void(const std::string&, const MediaStreamDevices&) >
     MediaRequestResponseCallback;
 
 // StreamOptions is a Chromium representation of WebKit's
 // WebUserMediaRequest Options. It describes the components
 // in a request for a new media stream.
 struct CONTENT_EXPORT StreamOptions {
   StreamOptions();
   StreamOptions(MediaStreamType audio_type, MediaStreamType video_type);
 
   // If not NO_SERVICE, the stream shall contain an audio input stream.
@@ skipping 25 matching lines @@
   // friendly name connected to the computer, this will be unique.
   std::string device_id;
   // Set to true if the device has been opened, false otherwise.
   bool in_use;
   // Id for this capture session. Unique for all sessions of the same type.
   int session_id;
 };
 
 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray;
 
-}  // namespace media_stream
+}  // namespace content
 
 #endif  // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_