Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away

BUG=
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36229004

Cr-Commit-Position: refs/heads/master@{#8517}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h

@@ -13,10 +13,10 @@
 
 #include <vector>
 
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {
 
@@ -112,14 +112,14 @@ class AudioEncoderDecoderIsacT : public AudioEncoder, public AudioDecoder {
   // iSAC encoder/decoder state, guarded by a mutex to ensure that encode calls
   // from one thread won't clash with decode calls from another thread.
   // Note: PT_GUARDED_BY is disabled since it is not yet supported by clang.
-  const scoped_ptr<CriticalSectionWrapper> state_lock_;
+  const rtc::scoped_ptr<CriticalSectionWrapper> state_lock_;
   typename T::instance_type* isac_state_
       GUARDED_BY(state_lock_) /* PT_GUARDED_BY(lock_)*/;
 
   int decoder_sample_rate_hz_ GUARDED_BY(state_lock_);
 
   // Must be acquired before state_lock_.
-  const scoped_ptr<CriticalSectionWrapper> lock_;
+  const rtc::scoped_ptr<CriticalSectionWrapper> lock_;
 
   // Have we accepted input but not yet emitted it in a packet?
   bool packet_in_progress_ GUARDED_BY(lock_);

webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_red_unittest.cc

@@ -11,8 +11,8 @@
 #include <stdlib.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_isac.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {