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

content/browser/renderer_host/media/media_stream_manager_unittest.cc

Index: content/browser/renderer_host/media/media_stream_manager_unittest.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_manager_unittest.cc	(revision 164646)
+++ content/browser/renderer_host/media/media_stream_manager_unittest.cc	(working copy)
@@ -22,8 +22,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::BrowserThread;
-using content::BrowserThreadImpl;
 using testing::_;
 
 namespace content {
@@ -84,8 +82,7 @@
 
     // Create our own MediaStreamManager.
     audio_manager_.reset(new MockAudioManager());
-    media_stream_manager_.reset(
-        new media_stream::MediaStreamManager(audio_manager_.get()));
+    media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
 
     // Use fake devices in order to run on the bots.
     media_stream_manager_->UseFakeDevice();
@@ -101,10 +98,10 @@
   void MakeMediaAccessRequest(std::string* label) {
     const int render_process_id = 1;
     const int render_view_id = 1;
-    media_stream::StreamOptions components(content::MEDIA_DEVICE_AUDIO_CAPTURE,
-                                           content::MEDIA_DEVICE_VIDEO_CAPTURE);
+    StreamOptions components(MEDIA_DEVICE_AUDIO_CAPTURE,
+                             MEDIA_DEVICE_VIDEO_CAPTURE);
     const GURL security_origin;
-    media_stream::MediaRequestResponseCallback callback =
+    MediaRequestResponseCallback callback =
         base::Bind(&MediaStreamManagerTest::ResponseCallback,
                    base::Unretained(this));
     media_stream_manager_->MakeMediaAccessRequest(render_process_id,
@@ -119,7 +116,7 @@
   scoped_ptr<BrowserThreadImpl> ui_thread_;
   scoped_ptr<BrowserThreadImpl> io_thread_;
   scoped_ptr<media::AudioManager> audio_manager_;
-  scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
+  scoped_ptr<MediaStreamManager> media_stream_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManagerTest);
@@ -150,10 +147,10 @@
   std::string label2;
   int render_process_id = 2;
   int render_view_id = 2;
-  media_stream::StreamOptions components(content::MEDIA_DEVICE_AUDIO_CAPTURE,
-                                         content::MEDIA_DEVICE_VIDEO_CAPTURE);
+  StreamOptions components(MEDIA_DEVICE_AUDIO_CAPTURE,
+                           MEDIA_DEVICE_VIDEO_CAPTURE);
   GURL security_origin;
-  media_stream::MediaRequestResponseCallback callback =
+  MediaRequestResponseCallback callback =
       base::Bind(&MediaStreamManagerTest::ResponseCallback,
                  base::Unretained(this));
   media_stream_manager_->MakeMediaAccessRequest(render_process_id,