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

Side by Side Diff: content/browser/media/audio_stream_monitor_unittest.cc

Issue 629963002: Replacing the OVERRIDE with override and FINAL with final in content/browser/media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/browser/media/audio_stream_monitor.h" 5 #include "content/browser/media/audio_stream_monitor.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 28 matching lines...) Expand all
39 39
40 } // namespace 40 } // namespace
41 41
42 class AudioStreamMonitorTest : public RenderViewHostTestHarness { 42 class AudioStreamMonitorTest : public RenderViewHostTestHarness {
43 public: 43 public:
44 AudioStreamMonitorTest() { 44 AudioStreamMonitorTest() {
45 // Start |clock_| at non-zero. 45 // Start |clock_| at non-zero.
46 clock_.Advance(base::TimeDelta::FromSeconds(1000000)); 46 clock_.Advance(base::TimeDelta::FromSeconds(1000000));
47 } 47 }
48 48
49 virtual void SetUp() OVERRIDE { 49 virtual void SetUp() override {
50 RenderViewHostTestHarness::SetUp(); 50 RenderViewHostTestHarness::SetUp();
51 51
52 WebContentsImpl* web_contents = reinterpret_cast<WebContentsImpl*>( 52 WebContentsImpl* web_contents = reinterpret_cast<WebContentsImpl*>(
53 RenderViewHostTestHarness::web_contents()); 53 RenderViewHostTestHarness::web_contents());
54 web_contents->SetDelegate(&mock_web_contents_delegate_); 54 web_contents->SetDelegate(&mock_web_contents_delegate_);
55 monitor_ = web_contents->audio_stream_monitor(); 55 monitor_ = web_contents->audio_stream_monitor();
56 const_cast<base::TickClock*&>(monitor_->clock_) = &clock_; 56 const_cast<base::TickClock*&>(monitor_->clock_) = &clock_;
57 } 57 }
58 58
59 base::TimeTicks GetTestClockTime() { return clock_.NowTicks(); } 59 base::TimeTicks GetTestClockTime() { return clock_.NowTicks(); }
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 StartMonitoring( 288 StartMonitoring(
289 kAnotherRenderProcessId, kStreamId, CreatePollCallback(kStreamId)); 289 kAnotherRenderProcessId, kStreamId, CreatePollCallback(kStreamId));
290 ExpectIsPolling(kRenderProcessId, kStreamId, true); 290 ExpectIsPolling(kRenderProcessId, kStreamId, true);
291 ExpectIsPolling(kAnotherRenderProcessId, kStreamId, true); 291 ExpectIsPolling(kAnotherRenderProcessId, kStreamId, true);
292 StopMonitoring(kAnotherRenderProcessId, kStreamId); 292 StopMonitoring(kAnotherRenderProcessId, kStreamId);
293 ExpectIsPolling(kRenderProcessId, kStreamId, true); 293 ExpectIsPolling(kRenderProcessId, kStreamId, true);
294 ExpectIsPolling(kAnotherRenderProcessId, kStreamId, false); 294 ExpectIsPolling(kAnotherRenderProcessId, kStreamId, false);
295 } 295 }
296 296
297 } // namespace content 297 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/android/media_resource_getter_impl.h ('k') | content/browser/media/capture/desktop_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698