content/shell/renderer/test_runner/web_test_proxy.h - Issue 308073011: test_runner: Migrate WebUserMediaClientMock to our Chromium C++ style.

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/shell/renderer/test_runner/web_test_proxy.h

Issue 308073011: test_runner: Migrate WebUserMediaClientMock to our Chromium C++ style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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/shell/renderer/test_runner/mock_web_user_media_client.cc ('k') | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/test_runner/web_test_proxy.h

diff --git a/content/shell/renderer/test_runner/web_test_proxy.h b/content/shell/renderer/test_runner/web_test_proxy.h

index 605362ae83bd9ee57d6efb1efb8ad51af619360a..1f9f181ba1ef0bf8d9165d0af6150af6ba310d85 100644

--- a/content/shell/renderer/test_runner/web_test_proxy.h

+++ b/content/shell/renderer/test_runner/web_test_proxy.h

@@ -75,12 +75,12 @@ typedef unsigned WebColor;

namespace content {

class MockWebSpeechRecognizer;

+class MockWebUserMediaClient;

class RenderFrame;

class SpellCheckClient;

class TestInterfaces;

class WebTestDelegate;

class WebTestInterfaces;

-class WebUserMediaClientMock;

// WebTestProxyBase is the "brain" of WebTestProxy in the sense that

// WebTestProxy does the bridge between RenderViewImpl and WebTestProxyBase and

@@ -251,7 +251,7 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {

WebTaskList task_list_;

scoped_ptr<SpellCheckClient> spellcheck_;

- scoped_ptr<WebUserMediaClientMock> user_media_client_;

+ scoped_ptr<MockWebUserMediaClient> user_media_client_;

bool animate_scheduled_;

std::map<unsigned, std::string> resource_identifier_map_;