Revert of Allow intelligibility to compile in apm

webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-//
-//  Specifies helper classes for intelligibility enhancement.
-//
-
 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_
 
 #include <complex>
 
-#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {
 
 namespace intelligibility {
 
 // Internal helper for computing the variances of a stream of arrays.
 // The result is an array of variances per position: the i-th variance
 // is the variance of the stream of data on the i-th positions in the
 // input arrays.
 // There are four methods of computation:
@@ skipping 29 matching lines @@
   void Step(const std::complex<float>* data, bool skip_fudge = false) {
     (this->*step_func_)(data, skip_fudge);
   }
   // Reset variances to zero and forget all history.
   void Clear();
   // Scale the input data by |scale|. Effectively multiply variances
   // by |scale^2|.
   void ApplyScale(float scale);
 
   // The current set of variances.
-  const float* variance() const { return variance_.get(); }
+  const float* variance() const {
+    return variance_.get();
+  }
 
   // The mean value of the current set of variances.
-  float array_mean() const { return array_mean_; }
+  float array_mean() const {
+    return array_mean_;
+  }
 
  private:
   void InfiniteStep(const std::complex<float>* data, bool dummy);
   void DecayStep(const std::complex<float>* data, bool dummy);
   void WindowedStep(const std::complex<float>* data, bool dummy);
   void BlockedStep(const std::complex<float>* data, bool dummy);
 
-  // TODO(ekmeyerson): Switch the following running means
-  // and histories from rtc::scoped_ptr to std::vector.
-
   // The current average X and X^2.
-  rtc::scoped_ptr<std::complex<float>[]> running_mean_;
-  rtc::scoped_ptr<std::complex<float>[]> running_mean_sq_;
+  scoped_ptr<std::complex<float>[]> running_mean_;
+  scoped_ptr<std::complex<float>[]> running_mean_sq_;
 
   // Average X and X^2 for the current block in kStepBlocked.
-  rtc::scoped_ptr<std::complex<float>[]> sub_running_mean_;
-  rtc::scoped_ptr<std::complex<float>[]> sub_running_mean_sq_;
+  scoped_ptr<std::complex<float>[]> sub_running_mean_;
+  scoped_ptr<std::complex<float>[]> sub_running_mean_sq_;
 
   // Sample history for the rolling window in kStepWindowed and block-wise
   // histories for kStepBlocked.
-  rtc::scoped_ptr<rtc::scoped_ptr<std::complex<float>[]>[]> history_;
-  rtc::scoped_ptr<rtc::scoped_ptr<std::complex<float>[]>[]> subhistory_;
-  rtc::scoped_ptr<rtc::scoped_ptr<std::complex<float>[]>[]> subhistory_sq_;
+  scoped_ptr<scoped_ptr<std::complex<float>[]>[]> history_;
+  scoped_ptr<scoped_ptr<std::complex<float>[]>[]> subhistory_;
+  scoped_ptr<scoped_ptr<std::complex<float>[]>[]> subhistory_sq_;
 
   // The current set of variances and sums for Welford's algorithm.
-  rtc::scoped_ptr<float[]> variance_;
-  rtc::scoped_ptr<float[]> conj_sum_;
+  scoped_ptr<float[]> variance_;
+  scoped_ptr<float[]> conj_sum_;
 
   const int freqs_;
   const int window_size_;
   const float decay_;
   int history_cursor_;
   int count_;
   float array_mean_;
   void (VarianceArray::*step_func_)(const std::complex<float>*, bool);
 };
 
 // Helper class for smoothing gain changes. On each applicatiion step, the
 // currently used gains are changed towards a set of settable target gains,
 // constrained by a limit on the magnitude of the changes.
 class GainApplier {
  public:
   GainApplier(int freqs, float change_limit);
 
   // Copy |in_block| to |out_block|, multiplied by the current set of gains,
   // and step the current set of gains towards the target set.
   void Apply(const std::complex<float>* in_block,
              std::complex<float>* out_block);
 
   // Return the current target gain set. Modify this array to set the targets.
-  float* target() const { return target_.get(); }
+  float* target() const {
+    return target_.get();
+  }
 
  private:
   const int freqs_;
   const float change_limit_;
-  rtc::scoped_ptr<float[]> target_;
-  rtc::scoped_ptr<float[]> current_;
+  scoped_ptr<float[]> target_;
+  scoped_ptr<float[]> current_;
 };
 
 }  // namespace intelligibility
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_
+