Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: media/cdm/external_clear_key_test_helper.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 5 years 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
« no previous file with comments | « media/cdm/cenc_utils_unittest.cc ('k') | media/cdm/json_web_key.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "media/cdm/external_clear_key_test_helper.h" 5 #include "media/cdm/external_clear_key_test_helper.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "build/build_config.h"
10 #include "media/cdm/api/content_decryption_module.h" 11 #include "media/cdm/api/content_decryption_module.h"
11 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
12 13
13 namespace media { 14 namespace media {
14 15
15 // INITIALIZE_CDM_MODULE is a macro in api/content_decryption_module.h. 16 // INITIALIZE_CDM_MODULE is a macro in api/content_decryption_module.h.
16 // However, we need to pass it as a string to GetFunctionPointer() once it 17 // However, we need to pass it as a string to GetFunctionPointer() once it
17 // is expanded. 18 // is expanded.
18 #define STRINGIFY(X) #X 19 #define STRINGIFY(X) #X
19 #define MAKE_STRING(X) STRINGIFY(X) 20 #define MAKE_STRING(X) STRINGIFY(X)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // Call DeinitializeCdmModule() 63 // Call DeinitializeCdmModule()
63 typedef void (*DeinitializeCdmFunc)(); 64 typedef void (*DeinitializeCdmFunc)();
64 DeinitializeCdmFunc deinitialize_cdm_func = 65 DeinitializeCdmFunc deinitialize_cdm_func =
65 reinterpret_cast<DeinitializeCdmFunc>( 66 reinterpret_cast<DeinitializeCdmFunc>(
66 library_.GetFunctionPointer("DeinitializeCdmModule")); 67 library_.GetFunctionPointer("DeinitializeCdmModule"));
67 ASSERT_TRUE(deinitialize_cdm_func) << "No DeinitializeCdmModule() in library"; 68 ASSERT_TRUE(deinitialize_cdm_func) << "No DeinitializeCdmModule() in library";
68 deinitialize_cdm_func(); 69 deinitialize_cdm_func();
69 } 70 }
70 71
71 } // namespace media 72 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/cenc_utils_unittest.cc ('k') | media/cdm/json_web_key.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698