content/test/webrtc_audio_device_test.h - Issue 12153002: Move chrome://media-internals to content. This allows us to hide implementation details from the pu…

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/test/webrtc_audio_device_test.h

Issue 12153002: Move chrome://media-internals to content. This allows us to hide implementation details from the pu… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 11 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

« content/public/browser/media_observer.h ('K') | « content/public/common/url_constants.cc ('k') | content/test/webrtc_audio_device_test.cc » ('j') | content/test/webrtc_audio_device_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/webrtc_audio_device_test.h

===================================================================

--- content/test/webrtc_audio_device_test.h (revision 179909)

+++ content/test/webrtc_audio_device_test.h (working copy)

@@ -156,8 +156,8 @@

void WaitForMessageLoopCompletion(base::MessageLoopProxy* loop);

// Convenience getter for gmock.

- MockMediaObserver& media_observer() const {

- return *media_observer_.get();

+ MockMediaInternals& media_observer() const {

+ return *media_internals_.get();

}

std::string GetTestDataPath(const FilePath::StringType& file_name);

@@ -167,7 +167,7 @@

ContentRendererClient content_renderer_client_;

RenderThreadImpl* render_thread_; // Owned by mock_process_.

scoped_ptr<WebRTCMockRenderProcess> mock_process_;

- scoped_ptr<MockMediaObserver> media_observer_;

+ scoped_ptr<MockMediaInternals> media_internals_;

scoped_ptr<MediaStreamManager> media_stream_manager_;

scoped_ptr<media::AudioManager> audio_manager_;

scoped_ptr<AudioMirroringManager> mirroring_manager_;