Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Side by Side Diff: content/browser/renderer_host/media/video_capture_manager_unittest.cc

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out some webrtc files. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Unit test for VideoCaptureManager. 5 // Unit test for VideoCaptureManager.
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 28 matching lines...) Expand all
39 MOCK_METHOD2(DevicesEnumerated, void(MediaStreamType, 39 MOCK_METHOD2(DevicesEnumerated, void(MediaStreamType,
40 const StreamDeviceInfoArray&)); 40 const StreamDeviceInfoArray&));
41 MOCK_METHOD2(Aborted, void(MediaStreamType, int)); 41 MOCK_METHOD2(Aborted, void(MediaStreamType, int));
42 }; // class MockMediaStreamProviderListener 42 }; // class MockMediaStreamProviderListener
43 43
44 // Needed as an input argument to StartCaptureForClient(). 44 // Needed as an input argument to StartCaptureForClient().
45 class MockFrameObserver : public VideoCaptureControllerEventHandler { 45 class MockFrameObserver : public VideoCaptureControllerEventHandler {
46 public: 46 public:
47 MOCK_METHOD1(OnError, void(VideoCaptureControllerID id)); 47 MOCK_METHOD1(OnError, void(VideoCaptureControllerID id));
48 48
49 virtual void OnBufferCreated(VideoCaptureControllerID id, 49 void OnBufferCreated(VideoCaptureControllerID id,
50 base::SharedMemoryHandle handle, 50 base::SharedMemoryHandle handle,
51 int length, int buffer_id) override {} 51 int length, int buffer_id) override {}
52 virtual void OnBufferDestroyed(VideoCaptureControllerID id, 52 void OnBufferDestroyed(VideoCaptureControllerID id, int buffer_id) override {}
53 int buffer_id) override {} 53 void OnBufferReady(
54 virtual void OnBufferReady(
55 VideoCaptureControllerID id, 54 VideoCaptureControllerID id,
56 int buffer_id, 55 int buffer_id,
57 const gfx::Size& coded_size, 56 const gfx::Size& coded_size,
58 const gfx::Rect& visible_rect, 57 const gfx::Rect& visible_rect,
59 const base::TimeTicks& timestamp, 58 const base::TimeTicks& timestamp,
60 scoped_ptr<base::DictionaryValue> metadata) override {} 59 scoped_ptr<base::DictionaryValue> metadata) override {}
61 virtual void OnMailboxBufferReady( 60 void OnMailboxBufferReady(
62 VideoCaptureControllerID id, 61 VideoCaptureControllerID id,
63 int buffer_id, 62 int buffer_id,
64 const gpu::MailboxHolder& mailbox_holder, 63 const gpu::MailboxHolder& mailbox_holder,
65 const gfx::Size& packed_frame_size, 64 const gfx::Size& packed_frame_size,
66 const base::TimeTicks& timestamp, 65 const base::TimeTicks& timestamp,
67 scoped_ptr<base::DictionaryValue> metadata) override {} 66 scoped_ptr<base::DictionaryValue> metadata) override {}
68 virtual void OnEnded(VideoCaptureControllerID id) override {} 67 void OnEnded(VideoCaptureControllerID id) override {}
69 68
70 void OnGotControllerCallback(VideoCaptureControllerID) {} 69 void OnGotControllerCallback(VideoCaptureControllerID) {}
71 }; 70 };
72 71
73 // Test class 72 // Test class
74 class VideoCaptureManagerTest : public testing::Test { 73 class VideoCaptureManagerTest : public testing::Test {
75 public: 74 public:
76 VideoCaptureManagerTest() : next_client_id_(1) {} 75 VideoCaptureManagerTest() : next_client_id_(1) {}
77 ~VideoCaptureManagerTest() override {} 76 ~VideoCaptureManagerTest() override {}
78 77
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 513
515 // Wait to check callbacks before removing the listener 514 // Wait to check callbacks before removing the listener
516 message_loop_->RunUntilIdle(); 515 message_loop_->RunUntilIdle();
517 vcm_->Unregister(); 516 vcm_->Unregister();
518 } 517 }
519 518
520 // TODO(mcasas): Add a test to check consolidation of the supported formats 519 // TODO(mcasas): Add a test to check consolidation of the supported formats
521 // provided by the device when http://crbug.com/323913 is closed. 520 // provided by the device when http://crbug.com/323913 is closed.
522 521
523 } // namespace content 522 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698