| Index: webrtc/test/fake_encoder.h
 | 
| diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h
 | 
| index ae869fff6abe0fd93547e51771d9f1d0f4913214..d5e7b480dfeac2bb47057921f38f16db8c764022 100644
 | 
| --- a/webrtc/test/fake_encoder.h
 | 
| +++ b/webrtc/test/fake_encoder.h
 | 
| @@ -13,6 +13,7 @@
 | 
|  
 | 
|  #include <vector>
 | 
|  
 | 
| +#include "webrtc/base/criticalsection.h"
 | 
|  #include "webrtc/common_types.h"
 | 
|  #include "webrtc/system_wrappers/include/clock.h"
 | 
|  #include "webrtc/video_encoder.h"
 | 
| @@ -75,12 +76,14 @@ class DelayedEncoder : public test::FakeEncoder {
 | 
|    DelayedEncoder(Clock* clock, int delay_ms);
 | 
|    virtual ~DelayedEncoder() {}
 | 
|  
 | 
| +  void SetDelay(int delay_ms);
 | 
|    int32_t Encode(const VideoFrame& input_image,
 | 
|                   const CodecSpecificInfo* codec_specific_info,
 | 
|                   const std::vector<FrameType>* frame_types) override;
 | 
|  
 | 
|   private:
 | 
| -  const int delay_ms_;
 | 
| +  rtc::CriticalSection lock_;
 | 
| +  int delay_ms_ GUARDED_BY(&lock_);
 | 
|  };
 | 
|  }  // namespace test
 | 
|  }  // namespace webrtc
 | 
| 
 |