content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc - Issue 566793002: MediaStream content_unittests need to trigger a GC before tear down

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

Issue 566793002: MediaStream content_unittests need to trigger a GC before tear down (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/webrtc/video_destination_handler_unittest.cc ('k') | content/renderer/media/webrtc_local_audio_source_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

index a5eced1d87a31cd47811b8ea6b6438852c58a9b5..2e9907ff35b5324b7bf5caf431228bc168fc3130 100644

--- a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

+++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

@@ -18,6 +18,7 @@

#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"

#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

#include "third_party/WebKit/public/platform/WebVector.h"

+#include "third_party/WebKit/public/web/WebHeap.h"

namespace content {

@@ -28,6 +29,12 @@ class WebRtcMediaStreamAdapterTest : public ::testing::Test {

dependency_factory_.reset(new MockPeerConnectionDependencyFactory());

}

+ virtual void TearDown() OVERRIDE {

+ adapter_.reset();

+ dependency_factory_.reset();

perkj_chrome 2014/09/15 07:17:53 Why is it necessary to reset |dependency_factory_|

haraken 2014/09/22 03:09:14 Good point. I confirmed that resetting dependency_

+ blink::WebHeap::collectAllGarbageForTesting();

+ }

blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) {

blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector(

audio ? static_cast<size_t>(1) : 0);