Move talk/media to webrtc/media

talk/app/webrtc/localaudiosource.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 13 matching lines @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef TALK_APP_WEBRTC_LOCALAUDIOSOURCE_H_
 #define TALK_APP_WEBRTC_LOCALAUDIOSOURCE_H_
 
 #include "talk/app/webrtc/mediastreaminterface.h"
 #include "talk/app/webrtc/notifier.h"
 #include "talk/app/webrtc/peerconnectioninterface.h"
-#include "talk/media/base/mediachannel.h"
 #include "webrtc/base/scoped_ptr.h"
+#include "webrtc/media/base/mediachannel.h"
 
 // LocalAudioSource implements AudioSourceInterface.
 // This contains settings for switching audio processing on and off.
 
 namespace webrtc {
 
 class MediaConstraintsInterface;
 
 class LocalAudioSource : public Notifier<AudioSourceInterface> {
  public:
@@ skipping 18 matching lines @@
   void Initialize(const PeerConnectionFactoryInterface::Options& options,
                   const MediaConstraintsInterface* constraints);
 
   cricket::AudioOptions options_;
   SourceState source_state_;
 };
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_LOCALAUDIOSOURCE_H_