media/cdm/aes_decryptor_unittest.cc - Issue 1542013004: Switch to standard integer types in media/, take 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/cdm/aes_decryptor_unittest.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more stddef Created 4 years, 12 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 <stdint.h>

	6

5 #include <string>	7 #include <string>

6 #include <vector>	8 #include <vector>

7	9

8 #include "base/bind.h"	10 #include "base/bind.h"

9 #include "base/debug/leak_annotations.h"	11 #include "base/debug/leak_annotations.h"

10 #include "base/json/json_reader.h"	12 #include "base/json/json_reader.h"

	13 #include "base/macros.h"

11 #include "base/values.h"	14 #include "base/values.h"

12 #include "media/base/cdm_callback_promise.h"	15 #include "media/base/cdm_callback_promise.h"

13 #include "media/base/cdm_config.h"	16 #include "media/base/cdm_config.h"

14 #include "media/base/cdm_key_information.h"	17 #include "media/base/cdm_key_information.h"

15 #include "media/base/decoder_buffer.h"	18 #include "media/base/decoder_buffer.h"

16 #include "media/base/decrypt_config.h"	19 #include "media/base/decrypt_config.h"

17 #include "media/base/decryptor.h"	20 #include "media/base/decryptor.h"

18 #include "media/base/mock_filters.h"	21 #include "media/base/mock_filters.h"

19 #include "media/cdm/aes_decryptor.h"	22 #include "media/cdm/aes_decryptor.h"

20 #include "media/cdm/api/content_decryption_module.h"	23 #include "media/cdm/api/content_decryption_module.h"

(...skipping 988 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1009 INSTANTIATE_TEST_CASE_P(CdmAdapter,	1012 INSTANTIATE_TEST_CASE_P(CdmAdapter,

1010 AesDecryptorTest,	1013 AesDecryptorTest,

1011 testing::Values("CdmAdapter"));	1014 testing::Values("CdmAdapter"));

1012 #endif	1015 #endif

1013	1016

1014 // TODO(jrummell): Once MojoCdm/MojoCdmService/MojoDecryptor/	1017 // TODO(jrummell): Once MojoCdm/MojoCdmService/MojoDecryptor/

1015 // MojoDecryptorService are implemented, add a third version that tests the	1018 // MojoDecryptorService are implemented, add a third version that tests the

1016 // CDM via mojo.	1019 // CDM via mojo.

1017	1020

1018 } // namespace media	1021 } // namespace media

OLD	NEW

« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | media/cdm/cdm_adapter.h » ('j') | no next file with comments »