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

Side by Side Diff: media/blink/cdm_result_promise_helper.h

Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception (Closed)
Patch Set: fix for media_remoting_unittests Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef MEDIA_BLINK_CDM_RESULT_PROMISE_HELPER_H_ 5 #ifndef MEDIA_BLINK_CDM_RESULT_PROMISE_HELPER_H_
6 #define MEDIA_BLINK_CDM_RESULT_PROMISE_HELPER_H_ 6 #define MEDIA_BLINK_CDM_RESULT_PROMISE_HELPER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "media/base/cdm_promise.h"
10 #include "media/base/media_keys.h" 11 #include "media/base/media_keys.h"
xhwang 2016/10/24 17:06:13 ditto
11 #include "media/blink/media_blink_export.h" 12 #include "media/blink/media_blink_export.h"
12 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" 13 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
13 14
14 namespace media { 15 namespace media {
15 16
16 // A superset of media::MediaKeys::Exception for UMA reporting. These values 17 // A superset of media::MediaKeys::Exception for UMA reporting. These values
17 // should never be changed as it will affect existing reporting, and must match 18 // should never be changed as it will affect existing reporting, and must match
18 // the values for CdmPromiseResult in tools/metrics/histograms/histograms.xml. 19 // the values for CdmPromiseResult in tools/metrics/histograms/histograms.xml.
19 enum CdmResultForUMA { 20 enum CdmResultForUMA {
20 SUCCESS = 0, 21 SUCCESS = 0,
21 NOT_SUPPORTED_ERROR = 1, 22 NOT_SUPPORTED_ERROR = 1,
22 INVALID_STATE_ERROR = 2, 23 INVALID_STATE_ERROR = 2,
23 INVALID_ACCESS_ERROR = 3, 24 INVALID_ACCESS_ERROR = 3,
24 QUOTA_EXCEEDED_ERROR = 4, 25 QUOTA_EXCEEDED_ERROR = 4,
25 UNKNOWN_ERROR = 5, 26 UNKNOWN_ERROR = 5,
26 CLIENT_ERROR = 6, 27 CLIENT_ERROR = 6,
27 OUTPUT_ERROR = 7, 28 OUTPUT_ERROR = 7,
28 NUM_RESULT_CODES 29 NUM_RESULT_CODES
29 }; 30 };
30 31
31 MEDIA_BLINK_EXPORT CdmResultForUMA 32 MEDIA_BLINK_EXPORT CdmResultForUMA
32 ConvertCdmExceptionToResultForUMA(MediaKeys::Exception exception_code); 33 ConvertCdmExceptionToResultForUMA(CdmPromise::Exception exception_code);
33 34
34 MEDIA_BLINK_EXPORT blink::WebContentDecryptionModuleException 35 MEDIA_BLINK_EXPORT blink::WebContentDecryptionModuleException
35 ConvertCdmException(MediaKeys::Exception exception_code); 36 ConvertCdmException(CdmPromise::Exception exception_code);
36 37
37 MEDIA_BLINK_EXPORT void ReportCdmResultUMA(const std::string& uma_name, 38 MEDIA_BLINK_EXPORT void ReportCdmResultUMA(const std::string& uma_name,
38 CdmResultForUMA result); 39 CdmResultForUMA result);
39 40
40 } // namespace media 41 } // namespace media
41 42
42 #endif // MEDIA_BLINK_CDM_RESULT_PROMISE_HELPER_H_ 43 #endif // MEDIA_BLINK_CDM_RESULT_PROMISE_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698