VideoCaptureHost/VideoCaptureControllerEventHandler cleanup

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/bind_helpers.h"
@@ skipping 26 matching lines @@
 class MockVideoCaptureControllerEventHandler
     : public VideoCaptureControllerEventHandler {
  public:
   explicit MockVideoCaptureControllerEventHandler(
       VideoCaptureController* controller)
       : controller_(controller) {}
   virtual ~MockVideoCaptureControllerEventHandler() {}
 
   // These mock methods are delegated to by our fake implementation of
   // VideoCaptureControllerEventHandler, to be used in EXPECT_CALL().
-  MOCK_METHOD1(DoBufferCreated, void(const VideoCaptureControllerID&));
-  MOCK_METHOD1(DoBufferDestroyed, void(const VideoCaptureControllerID&));
-  MOCK_METHOD1(DoBufferReady, void(const VideoCaptureControllerID&));
-  MOCK_METHOD1(DoMailboxBufferReady, void(const VideoCaptureControllerID&));
-  MOCK_METHOD1(DoEnded, void(const VideoCaptureControllerID&));
-  MOCK_METHOD1(DoError, void(const VideoCaptureControllerID&));
+  MOCK_METHOD1(DoBufferCreated, void(VideoCaptureControllerID));
+  MOCK_METHOD1(DoBufferDestroyed, void(VideoCaptureControllerID));
+  MOCK_METHOD1(DoBufferReady, void(VideoCaptureControllerID));
+  MOCK_METHOD1(DoMailboxBufferReady, void(VideoCaptureControllerID));
+  MOCK_METHOD1(DoEnded, void(VideoCaptureControllerID));
+  MOCK_METHOD1(DoError, void(VideoCaptureControllerID));
 
-  virtual void OnError(const VideoCaptureControllerID& id) override {
+  virtual void OnError(VideoCaptureControllerID id) override {
     DoError(id);
   }
-  virtual void OnBufferCreated(const VideoCaptureControllerID& id,
+  virtual void OnBufferCreated(VideoCaptureControllerID id,
                                base::SharedMemoryHandle handle,
                                int length, int buffer_id) override {
     DoBufferCreated(id);
   }
-  virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,
+  virtual void OnBufferDestroyed(VideoCaptureControllerID id,
                                  int buffer_id) override {
     DoBufferDestroyed(id);
   }
   virtual void OnBufferReady(
-      const VideoCaptureControllerID& id,
+      VideoCaptureControllerID id,
       int buffer_id,
       const gfx::Size& coded_size,
       const gfx::Rect& visible_rect,
-      base::TimeTicks timestamp,
+      const base::TimeTicks& timestamp,
       scoped_ptr<base::DictionaryValue> metadata) override {
     DoBufferReady(id);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&VideoCaptureController::ReturnBuffer,
                    base::Unretained(controller_),
                    id,
                    this,
                    buffer_id,
                    0));
   }
   virtual void OnMailboxBufferReady(
-      const VideoCaptureControllerID& id,
+      VideoCaptureControllerID id,
       int buffer_id,
       const gpu::MailboxHolder& mailbox_holder,
       const gfx::Size& packed_frame_size,
-      base::TimeTicks timestamp,
+      const base::TimeTicks& timestamp,
       scoped_ptr<base::DictionaryValue> metadata) override {
     DoMailboxBufferReady(id);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&VideoCaptureController::ReturnBuffer,
                    base::Unretained(controller_),
                    id,
                    this,
                    buffer_id,
                    mailbox_holder.sync_point));
   }
-  virtual void OnEnded(const VideoCaptureControllerID& id) override {
+  virtual void OnEnded(VideoCaptureControllerID id) override {
     DoEnded(id);
     // OnEnded() must respond by (eventually) unregistering the client.
     base::MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(base::IgnoreResult(&VideoCaptureController::RemoveClient),
                    base::Unretained(controller_), id, this));
   }
 
   VideoCaptureController* controller_;
 };
 
@@ skipping 529 matching lines @@
       params.requested_format.ImageAllocationSize(),
       params.requested_format,
       0 /* rotation */,
       base::TimeTicks());
     EXPECT_EQ(100, controller_->RemoveClient(route, client_a_.get()));
     Mock::VerifyAndClearExpectations(client_a_.get());
   }
 }
 
 }  // namespace content