Upstream version 10.38.222.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / sound / automaticallychosensoundsystem.h

diff --git a/src/third_party/libjingle/source/talk/sound/automaticallychosensoundsystem.h b/src/third_party/libjingle/source/talk/sound/automaticallychosensoundsystem.h
index 026c080..10ea0df 100644 (file)
--- a/src/third_party/libjingle/source/talk/sound/automaticallychosensoundsystem.h
+++ b/src/third_party/libjingle/source/talk/sound/automaticallychosensoundsystem.h
@@ -28,11 +28,11 @@
 #ifndef TALK_SOUND_AUTOMATICALLYCHOSENSOUNDSYSTEM_H_
 #define TALK_SOUND_AUTOMATICALLYCHOSENSOUNDSYSTEM_H_
 
-#include "talk/base/common.h"
-#include "talk/base/logging.h"
-#include "talk/base/scoped_ptr.h"
 #include "talk/sound/soundsysteminterface.h"
 #include "talk/sound/soundsystemproxy.h"
+#include "webrtc/base/common.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/scoped_ptr.h"
 
 namespace cricket {
 
@@ -54,7 +54,7 @@ class AutomaticallyChosenSoundSystem : public SoundSystemProxy {
   virtual const char *GetName() const;
 
  private:
-  talk_base::scoped_ptr<SoundSystemInterface> sound_systems_[kNumSoundSystems];
+  rtc::scoped_ptr<SoundSystemInterface> sound_systems_[kNumSoundSystems];
 };
 
 template <const SoundSystemCreator kSoundSystemCreators[], int kNumSoundSystems>