Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / video_capture_impl_manager_unittest.cc

diff --git a/src/content/renderer/media/video_capture_impl_manager_unittest.cc b/src/content/renderer/media/video_capture_impl_manager_unittest.cc
index 86cc56a..a688c12 100644 (file)
--- a/src/content/renderer/media/video_capture_impl_manager_unittest.cc
+++ b/src/content/renderer/media/video_capture_impl_manager_unittest.cc
@@ -35,9 +35,7 @@ class MockVideoCaptureImpl : public VideoCaptureImpl {
         destruct_callback_(destruct_callback) {
   }
 
-  virtual ~MockVideoCaptureImpl() {
-    destruct_callback_.Run();
-  }
+  ~MockVideoCaptureImpl() override { destruct_callback_.Run(); }
 
  private:
   base::Closure destruct_callback_;
@@ -51,12 +49,12 @@ class MockVideoCaptureImplManager : public VideoCaptureImplManager {
       base::Closure destruct_video_capture_callback)
       : destruct_video_capture_callback_(
           destruct_video_capture_callback) {}
-  virtual ~MockVideoCaptureImplManager() {}
+  ~MockVideoCaptureImplManager() override {}
 
  protected:
-  virtual VideoCaptureImpl* CreateVideoCaptureImplForTesting(
+  VideoCaptureImpl* CreateVideoCaptureImplForTesting(
       media::VideoCaptureSessionId id,
-      VideoCaptureMessageFilter* filter) const OVERRIDE {
+      VideoCaptureMessageFilter* filter) const override {
     return new MockVideoCaptureImpl(id,
                                     filter,
                                     destruct_video_capture_callback_);
@@ -93,9 +91,10 @@ class VideoCaptureImplManagerTest : public ::testing::Test {
   }
 
  protected:
-  MOCK_METHOD2(OnFrameReady,
+  MOCK_METHOD3(OnFrameReady,
               void(const scoped_refptr<media::VideoFrame>&,
-                   const media::VideoCaptureFormat&));
+                   const media::VideoCaptureFormat&,
+                   const base::TimeTicks& estimated_capture_time));
   MOCK_METHOD0(OnStarted, void());
   MOCK_METHOD0(OnStopped, void());