summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-23 20:43:25 +0000
committerjrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-23 20:43:25 +0000
commit7aface6ec119ce31aa74d0b311ddf8f4ade618f6 (patch)
treea3c407c2b053f4567d687f3578bcb387042cea3a
parentdc426a209973b4b05fe73cdf86147b8bb16cfd7c (diff)
downloadchromium_src-7aface6ec119ce31aa74d0b311ddf8f4ade618f6.zip
chromium_src-7aface6ec119ce31aa74d0b311ddf8f4ade618f6.tar.gz
chromium_src-7aface6ec119ce31aa74d0b311ddf8f4ade618f6.tar.bz2
Allow MEDIA_KEYERR_OUTPUT to show up in histograms
The Widevine CDM may report a MEDIA_KEYERR_OUTPUT due to the output device not having the appropriate protection. Allow the error to propogate up to Chrome so it can be reported to the user and shown in UMA stats. BUG=294501 Review URL: https://chromiumcodereview.appspot.com/23818007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224785 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/base/media_keys.h4
-rw-r--r--tools/metrics/histograms/histograms.xml1
2 files changed, 3 insertions, 2 deletions
diff --git a/media/base/media_keys.h b/media/base/media_keys.h
index cf170f0ca..9369c50 100644
--- a/media/base/media_keys.h
+++ b/media/base/media_keys.h
@@ -29,9 +29,9 @@ class MEDIA_EXPORT MediaKeys {
enum KeyError {
kUnknownError = 1,
kClientError,
- // The following v0.1b values have never been used.
+ // The commented v0.1b values below have never been used.
// kServiceError,
- // kOutputError,
+ kOutputError = 4,
// kHardwareChangeError,
// kDomainError,
kMaxKeyError // Must be last and greater than any legit value.
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 34c5bc2..fcb27b1 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -23378,6 +23378,7 @@ other types of suffix sets.
<enum name="MediaKeyError" type="int">
<int value="1" label="kUnknownError"/>
<int value="2" label="kClientError"/>
+ <int value="4" label="kOutputError"/>
</enum>
<enum name="MediaKeyException" type="int">