Make VideoCaptureController single-threaded and not ref counted.

content/browser/renderer_host/media/video_capture_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Unit test for VideoCaptureManager.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 67 matching lines @@
     io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
                                            message_loop_.get()));
     vcm_ = new VideoCaptureManager();
     vcm_->UseFakeDevice();
     vcm_->Register(listener_.get(), message_loop_->message_loop_proxy().get());
     frame_observer_.reset(new MockFrameObserver());
   }
 
   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,
+      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);
     }
     quit_closure.Run();
   }
 
   VideoCaptureControllerID StartClient(int session_id, bool expect_success) {
     media::VideoCaptureParams params;
     params.session_id = session_id;
     params.width = 320;
@@ skipping 200 matching lines @@
   // VideoCaptureManager destructor otherwise.
   vcm_->Close(video_session_id);
   StopClient(client_id);
 
   // Wait to check callbacks before removing the listener
   message_loop_->RunUntilIdle();
   vcm_->Unregister();
 }
 
 }  // namespace content