| 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);
|
| }
|
|
|