| Index: webrtc/modules/video_coding/test/test_util.h
 | 
| diff --git a/webrtc/modules/video_coding/test/test_util.h b/webrtc/modules/video_coding/test/test_util.h
 | 
| index 30f337d2bbbdf594fec4eea448d7bc161b4e19c0..45b88b9b50aa3b0260e513d0004052e5d56f62fc 100644
 | 
| --- a/webrtc/modules/video_coding/test/test_util.h
 | 
| +++ b/webrtc/modules/video_coding/test/test_util.h
 | 
| @@ -33,11 +33,13 @@ class NullEvent : public webrtc::EventWrapper {
 | 
|  
 | 
|    virtual bool Reset() { return true; }
 | 
|  
 | 
| -  virtual webrtc::EventTypeWrapper Wait(unsigned long max_time) {
 | 
| +  virtual webrtc::EventTypeWrapper Wait(unsigned long max_time) {  // NOLINT
 | 
|      return webrtc::kEventTimeout;
 | 
|    }
 | 
|  
 | 
| -  virtual bool StartTimer(bool periodic, unsigned long time) { return true; }
 | 
| +  virtual bool StartTimer(bool periodic, unsigned long time) {  // NOLINT
 | 
| +    return true;
 | 
| +  }
 | 
|  
 | 
|    virtual bool StopTimer() { return true; }
 | 
|  };
 | 
| @@ -46,9 +48,7 @@ class NullEventFactory : public webrtc::EventFactory {
 | 
|   public:
 | 
|    virtual ~NullEventFactory() {}
 | 
|  
 | 
| -  virtual webrtc::EventWrapper* CreateEvent() {
 | 
| -    return new NullEvent;
 | 
| -  }
 | 
| +  virtual webrtc::EventWrapper* CreateEvent() { return new NullEvent; }
 | 
|  };
 | 
|  
 | 
|  class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback {
 | 
| @@ -57,7 +57,7 @@ class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback {
 | 
|    virtual ~FileOutputFrameReceiver();
 | 
|  
 | 
|    // VCMReceiveCallback
 | 
| -  virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame);
 | 
| +  virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame);  // NOLINT
 | 
|  
 | 
|   private:
 | 
|    std::string out_filename_;
 | 
| 
 |