| Index: webrtc/media/engine/webrtcvideoengine2.h
 | 
| diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
 | 
| index 91a92bff5fc5a16ecbd8e92aa6d5addbeddb6bed..762af5889362a625f9429df3914f154fbf4c3696 100644
 | 
| --- a/webrtc/media/engine/webrtcvideoengine2.h
 | 
| +++ b/webrtc/media/engine/webrtcvideoengine2.h
 | 
| @@ -12,12 +12,12 @@
 | 
|  #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
 | 
|  
 | 
|  #include <map>
 | 
| +#include <memory>
 | 
|  #include <set>
 | 
|  #include <string>
 | 
|  #include <vector>
 | 
|  
 | 
|  #include "webrtc/base/criticalsection.h"
 | 
| -#include "webrtc/base/scoped_ptr.h"
 | 
|  #include "webrtc/base/thread_annotations.h"
 | 
|  #include "webrtc/base/thread_checker.h"
 | 
|  #include "webrtc/media/base/videosinkinterface.h"
 | 
| @@ -126,7 +126,7 @@ class WebRtcVideoEngine2 {
 | 
|  
 | 
|    WebRtcVideoDecoderFactory* external_decoder_factory_;
 | 
|    WebRtcVideoEncoderFactory* external_encoder_factory_;
 | 
| -  rtc::scoped_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_;
 | 
| +  std::unique_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_;
 | 
|  };
 | 
|  
 | 
|  class WebRtcVideoChannel2 : public VideoMediaChannel,
 | 
| 
 |