| Index: webrtc/modules/audio_coding/neteq/expand.h | 
| diff --git a/webrtc/modules/audio_coding/neteq/expand.h b/webrtc/modules/audio_coding/neteq/expand.h | 
| index 5fb117d519c684cf8ba8e978228b98ddc8da9c75..6439e7cc8adf7b7e777bcc38bb212dfb873e8134 100644 | 
| --- a/webrtc/modules/audio_coding/neteq/expand.h | 
| +++ b/webrtc/modules/audio_coding/neteq/expand.h | 
| @@ -62,7 +62,7 @@ class Expand { | 
|  | 
| // Accessors and mutators. | 
| virtual size_t overlap_length() const; | 
| -  int16_t max_lag() const { return max_lag_; } | 
| +  size_t max_lag() const { return max_lag_; } | 
|  | 
| protected: | 
| static const int kMaxConsecutiveExpands = 200; | 
| @@ -94,11 +94,11 @@ class Expand { | 
| int consecutive_expands_; | 
|  | 
| private: | 
| -  static const int kUnvoicedLpcOrder = 6; | 
| -  static const int kNumCorrelationCandidates = 3; | 
| -  static const int kDistortionLength = 20; | 
| -  static const int kLpcAnalysisLength = 160; | 
| -  static const int kMaxSampleRate = 48000; | 
| +  static const size_t kUnvoicedLpcOrder = 6; | 
| +  static const size_t kNumCorrelationCandidates = 3; | 
| +  static const size_t kDistortionLength = 20; | 
| +  static const size_t kLpcAnalysisLength = 160; | 
| +  static const size_t kMaxSampleRate = 48000; | 
| static const int kNumLags = 3; | 
|  | 
| struct ChannelParameters { | 
| @@ -129,7 +129,7 @@ class Expand { | 
|  | 
| BackgroundNoise* background_noise_; | 
| const size_t overlap_length_; | 
| -  int16_t max_lag_; | 
| +  size_t max_lag_; | 
| size_t expand_lags_[kNumLags]; | 
| int lag_index_direction_; | 
| int current_lag_index_; | 
|  |