| Index: webrtc/modules/audio_coding/main/acm2/codec_manager.h
 | 
| diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.h b/webrtc/modules/audio_coding/main/acm2/codec_manager.h
 | 
| index c6c262ea266fa6b94d1d56afab37a4139d6661d2..26b5a2802ecbe7558bf114dd5e7091f2dcd5f48a 100644
 | 
| --- a/webrtc/modules/audio_coding/main/acm2/codec_manager.h
 | 
| +++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.h
 | 
| @@ -12,6 +12,7 @@
 | 
|  #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_
 | 
|  
 | 
|  #include "webrtc/base/constructormagic.h"
 | 
| +#include "webrtc/base/maybe.h"
 | 
|  #include "webrtc/base/scoped_ptr.h"
 | 
|  #include "webrtc/base/thread_checker.h"
 | 
|  #include "webrtc/modules/audio_coding/main/acm2/codec_owner.h"
 | 
| @@ -34,7 +35,7 @@ class CodecManager final {
 | 
|  
 | 
|    void RegisterEncoder(AudioEncoder* external_speech_encoder);
 | 
|  
 | 
| -  int GetCodecInst(CodecInst* current_codec) const;
 | 
| +  rtc::Maybe<CodecInst> GetCodecInst() const;
 | 
|  
 | 
|    bool SetCopyRed(bool enable);
 | 
|  
 | 
| 
 |