media/cdm/ppapi/external_clear_key/clear_key_cdm.h - Issue 2095963004: Revert of media: Add OutputProtectionProxy

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: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

Issue 2095963004: Revert of media: Add OutputProtectionProxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

index 379498f996477801e1a1b1790eafcf263f0fb07c..559e4db27b7538387fc45e75bfe59ef85b81e967 100644

--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

@@ -140,14 +140,10 @@

cdm::AudioFrames* audio_frames);

#endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER

- void OnUnitTestComplete(bool success);

void StartFileIOTest();

// Callback for CDM File IO test.

void OnFileIOTestComplete(bool success);

- void StartOutputProtectionTest();

// Keep track of the last session created.

void SetSessionId(const std::string& session_id);

@@ -213,8 +209,6 @@

std::unique_ptr<FileIOTestRunner> file_io_test_runner_;

- bool is_running_output_protection_test_;

DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);

};