Move a bunch of code in content\renderer to the content namespace.

content/renderer/media/media_stream_dependency_factory.cc

 // 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.
 
 #include "content/renderer/media/media_stream_dependency_factory.h"
 
 #include <vector>
 
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
@@ skipping 164 matching lines @@
     const bool is_screencast = (source_data->device_info().stream_type ==
                                     content::MEDIA_TAB_VIDEO_CAPTURE);
     scoped_refptr<webrtc::LocalVideoTrackInterface> video_track(
         CreateLocalVideoTrack(UTF16ToUTF8(source.id()),
                               source_data->device_info().session_id,
                               is_screencast));
     native_stream->AddTrack(video_track);
     video_track->set_enabled(video_components[i].isEnabled());
   }
 
-  description->setExtraData(new MediaStreamExtraData(native_stream));
+  description->setExtraData(new content::MediaStreamExtraData(native_stream));
   return true;
 }
 
 bool MediaStreamDependencyFactory::CreateNativeLocalMediaStream(
     WebKit::WebMediaStreamDescriptor* description,
-    const MediaStreamExtraData::StreamStopCallback& stream_stop) {
+    const content::MediaStreamExtraData::StreamStopCallback& stream_stop) {
   if (!CreateNativeLocalMediaStream(description))
     return false;
 
-  MediaStreamExtraData* extra_data =
-      static_cast<MediaStreamExtraData*>(description->extraData());
+  content::MediaStreamExtraData* extra_data =
+      static_cast<content::MediaStreamExtraData*>(description->extraData());
   extra_data->SetLocalStreamStopCallback(stream_stop);
   return true;
 }
 
 bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() {
   if (!pc_factory_.get()) {
     DCHECK(!audio_device_);
-    audio_device_ = new WebRtcAudioDeviceImpl();
+    audio_device_ = new content::WebRtcAudioDeviceImpl();
     scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory(
         webrtc::CreatePeerConnectionFactory(worker_thread_,
                                             signaling_thread_,
                                             audio_device_));
     if (factory.get())
       pc_factory_ = factory.release();
   }
   return pc_factory_.get() != NULL;
 }
 
@@ skipping 168 matching lines @@
           base::Unretained(this)));
       // Stopping the thread will wait until all tasks have been
       // processed before returning. We wait for the above task to finish before
       // letting the the function continue to avoid any potential race issues.
       chrome_worker_thread_.Stop();
     } else {
       NOTREACHED() << "Worker thread not running.";
     }
   }
 }