refactor VideoCaptureHost and VideoCaptureController.

content/browser/renderer_host/media/video_capture_controller_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 VideoCaptureController.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 13 matching lines @@
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::AtLeast;
 using ::testing::InSequence;
 using ::testing::Return;
 using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 enum { kDeviceId = 1 };
 
-ACTION_P5(StopCapture, controller, controller_id, controller_handler, flag,
+ACTION_P4(StopCapture, controller, controller_id, controller_handler,
           message_loop) {
   message_loop->PostTask(FROM_HERE,
       base::Bind(&VideoCaptureController::StopCapture,
-                 controller, controller_id, controller_handler, flag));
+                 controller, controller_id, controller_handler));
   message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 ACTION_P3(StopSession, controller, session_id, message_loop) {
   message_loop->PostTask(FROM_HERE,
       base::Bind(&VideoCaptureController::StopSession,
                  controller, session_id));
   message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
@@ skipping 34 matching lines @@
                            int width,
                            int height,
                            int frame_per_second) OVERRIDE {
     EXPECT_EQ(id, controller_id_);
     DoFrameInfo(id);
   }
   virtual void OnPaused(const VideoCaptureControllerID& id) OVERRIDE {
     EXPECT_EQ(id, controller_id_);
     DoPaused(id);
   }
-  virtual void OnReadyToDelete(const VideoCaptureControllerID& id) OVERRIDE {}
 
   scoped_refptr<VideoCaptureController> controller_;
   MessageLoop* message_loop_;
   VideoCaptureControllerID controller_id_;
   base::ProcessHandle process_handle_;
 };
 
 class MockVideoCaptureManager
     : public media_stream::VideoCaptureManager {
  public:
@@ skipping 95 matching lines @@
               DoFrameInfo(controller_handler_->controller_id_))
       .Times(AtLeast(1));
   EXPECT_CALL(*controller_handler_,
               DoBufferCreated(controller_handler_->controller_id_))
       .Times(AtLeast(1));
   EXPECT_CALL(*controller_handler_,
               DoBufferReady(controller_handler_->controller_id_))
       .Times(AtLeast(1))
       .WillOnce(StopCapture(controller_.get(),
                             controller_handler_->controller_id_,
-                            controller_handler_.get(), true,
+                            controller_handler_.get(),
                             message_loop_.get()));
   EXPECT_CALL(*vcm_,
               StopCapture(vcm_->video_session_id_))
       .Times(1);
 
   controller_->StartCapture(controller_handler_->controller_id_,
                             controller_handler_.get(),
                             controller_handler_->process_handle_,
                             capture_params);
   message_loop_->Run();
@@ skipping 41 matching lines @@
               DoBufferReady(controller_handler_->controller_id_))
       .Times(0);
   message_loop_->PostDelayedTask(
       FROM_HERE, MessageLoop::QuitClosure(), base::TimeDelta::FromSeconds(1));
   message_loop_->Run();
 
   EXPECT_CALL(*vcm_,
               StopCapture(vcm_->video_session_id_))
       .Times(1);
   controller_->StopCapture(controller_handler_->controller_id_,
-                           controller_handler_.get(), true);
+                           controller_handler_.get());
 }