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

Unified Diff: content/browser/renderer_host/media/video_capture_manager_unittest.cc

Issue 24133002: Make VideoCaptureController single-threaded and not ref counted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git pull Created 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index 92a04da2ccac9335fc32038b8c2638b1681368fc..34172d78cb4820745c1fa706a186adde23bc14f3 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -85,14 +85,15 @@ class VideoCaptureManagerTest : public testing::Test {
virtual void TearDown() OVERRIDE {}
- void OnGotControllerCallback(VideoCaptureControllerID id,
- base::Closure quit_closure,
- bool expect_success,
- VideoCaptureController* controller) {
+ void OnGotControllerCallback(
+ VideoCaptureControllerID id,
+ base::Closure quit_closure,
+ bool expect_success,
+ const base::WeakPtr<VideoCaptureController>& controller) {
if (expect_success) {
- ASSERT_TRUE(NULL != controller);
+ ASSERT_TRUE(controller);
ASSERT_TRUE(0 == controllers_.count(id));
- controllers_[id] = controller;
+ controllers_[id] = controller.get();
} else {
ASSERT_TRUE(NULL == controller);
}

Powered by Google App Engine
This is Rietveld 408576698