Make VideoCaptureController single-threaded and not ref counted.

content/browser/renderer_host/media/web_contents_video_capture_device_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.
 
 #include "content/browser/renderer_host/media/web_contents_video_capture_device.h"
 
 #include "base/bind_helpers.h"
 #include "base/debug/debugger.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 475 matching lines @@
 
     base::RunLoop().RunUntilIdle();
 
     SiteInstanceImpl::set_render_process_host_factory(NULL);
     render_view_host_factory_.reset();
     render_process_host_factory_.reset();
   }
 
   // Accessors.
   CaptureTestSourceController* source() { return &controller_; }
-  media::VideoCaptureDevice* device() { return device_.get(); }
+  media::VideoCaptureDevice1* device() { return device_.get(); }
   StubConsumer* consumer() { return &consumer_; }
 
   void SimulateDrawEvent() {
     if (source()->CanUseFrameSubscriber()) {
       // Print
       CaptureTestView* test_view = static_cast<CaptureTestView*>(
           web_contents_->GetRenderViewHost()->GetView());
       test_view->SimulateUpdate();
     } else {
       // Simulate a non-accelerated paint.
@@ skipping 18 matching lines @@
 
   // Creates capture-capable RenderViewHosts whose pixel content production is
   // under the control of |controller_|.
   scoped_ptr<CaptureTestRenderViewHostFactory> render_view_host_factory_;
 
   // A mocked-out browser and tab.
   scoped_ptr<TestBrowserContext> browser_context_;
   scoped_ptr<WebContents> web_contents_;
 
   // Finally, the WebContentsVideoCaptureDevice under test.
-  scoped_ptr<media::VideoCaptureDevice> device_;
+  scoped_ptr<media::VideoCaptureDevice1> device_;
 
   TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(WebContentsVideoCaptureDeviceTest, InvalidInitialWebContentsError) {
   // Before the installs itself on the UI thread up to start capturing, we'll
   // delete the web contents. This should trigger an error which can happen in
   // practice; we should be able to recover gracefully.
   ResetWebContents();
 
@@ skipping 200 matching lines @@
   media::VideoCaptureCapability capture_format(
       1280,
       720,
       -2,
       media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
-                          base::Bind(&media::VideoCaptureDevice::Allocate,
+                          base::Bind(&media::VideoCaptureDevice1::Allocate,
                                      base::Unretained(device()),
                                      capture_format,
                                      consumer()));
   ASSERT_NO_FATAL_FAILURE(consumer()->WaitForError());
 }
 
 TEST_F(WebContentsVideoCaptureDeviceTest, BadFramesGoodFrames) {
   media::VideoCaptureCapability capture_format(
       kTestWidth,
       kTestHeight,
@@ skipping 23 matching lines @@
   ASSERT_NO_FATAL_FAILURE(consumer()->WaitForNextColor(SK_ColorGREEN));
   source()->SetSolidColor(SK_ColorRED);
   ASSERT_NO_FATAL_FAILURE(consumer()->WaitForNextColor(SK_ColorRED));
 
   device()->Stop();
   device()->DeAllocate();
 }
 
 }  // namespace
 }  // namespace content