Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: content/renderer/media/video_capture_impl_unittest.cc

Issue 1304983005: Revert of Change VideoCaptureDeliverFrameCB's signature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "content/child/child_process.h" 6 #include "content/child/child_process.h"
7 #include "content/common/media/video_capture_messages.h" 7 #include "content/common/media/video_capture_messages.h"
8 #include "content/renderer/media/video_capture_impl.h" 8 #include "content/renderer/media/video_capture_impl.h"
9 #include "media/base/bind_to_current_loop.h" 9 #include "media/base/bind_to_current_loop.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 session_id_, message_filter_.get())); 126 session_id_, message_filter_.get()));
127 127
128 video_capture_impl_->device_id_ = 2; 128 video_capture_impl_->device_id_ = 2;
129 } 129 }
130 130
131 virtual ~VideoCaptureImplTest() { 131 virtual ~VideoCaptureImplTest() {
132 } 132 }
133 133
134 protected: 134 protected:
135 MOCK_METHOD2(OnFrameReady, 135 MOCK_METHOD2(OnFrameReady,
136 void(const scoped_refptr<media::VideoFrame>&, base::TimeTicks)); 136 void(const scoped_refptr<media::VideoFrame>&,
137 const base::TimeTicks&));
137 MOCK_METHOD1(OnStateUpdate, void(VideoCaptureState)); 138 MOCK_METHOD1(OnStateUpdate, void(VideoCaptureState));
138 MOCK_METHOD1(OnDeviceFormatsInUse, 139 MOCK_METHOD1(OnDeviceFormatsInUse,
139 void(const media::VideoCaptureFormats&)); 140 void(const media::VideoCaptureFormats&));
140 MOCK_METHOD1(OnDeviceSupportedFormats, 141 MOCK_METHOD1(OnDeviceSupportedFormats,
141 void(const media::VideoCaptureFormats&)); 142 void(const media::VideoCaptureFormats&));
142 143
143 void Init() { 144 void Init() {
144 video_capture_impl_->Init(); 145 video_capture_impl_->Init();
145 } 146 }
146 147
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 StartCapture(params_small_); 251 StartCapture(params_small_);
251 252
252 // Receive state change message from browser. 253 // Receive state change message from browser.
253 video_capture_impl_->ReceiveStateChangeMessage(VIDEO_CAPTURE_STATE_ERROR); 254 video_capture_impl_->ReceiveStateChangeMessage(VIDEO_CAPTURE_STATE_ERROR);
254 255
255 StopCapture(); 256 StopCapture();
256 DeInit(); 257 DeInit();
257 } 258 }
258 259
259 } // namespace content 260 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/video_capture_impl_manager_unittest.cc ('k') | content/renderer/media/video_source_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698