diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 22:12:50 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 22:12:50 +0000 |
| commit | f3a1d40d66739544a90212f92dac4080c3f3df71 (patch) | |
| tree | 0dce46a8022914f08528623031414904313bec55 /content | |
| parent | d4c5e4b4ec1706cf6981aafcf4aa3b7c3a8e08f5 (diff) | |
| download | chromium_src-f3a1d40d66739544a90212f92dac4080c3f3df71.zip chromium_src-f3a1d40d66739544a90212f92dac4080c3f3df71.tar.gz chromium_src-f3a1d40d66739544a90212f92dac4080c3f3df71.tar.bz2 | |
Remove unused variant of KeySystemNameForUMA().
Eliminate the unnecessary conversions from WebString to std::string, and eliminate the subsequently unused
std::string version.
Review URL: https://chromiumcodereview.appspot.com/17607003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index c148f43..3bb3669 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -889,7 +889,7 @@ bool WebMediaPlayerAndroid::RetrieveGeometryChange(gfx::RectF* rect) { // UMA_HISTOGRAM_COUNTS. The reason that we cannot use those macros directly is // that UMA_* macros require the names to be constant throughout the process' // lifetime. -static void EmeUMAHistogramEnumeration(const std::string& key_system, +static void EmeUMAHistogramEnumeration(const WebKit::WebString& key_system, const std::string& method, int sample, int boundary_value) { @@ -899,7 +899,7 @@ static void EmeUMAHistogramEnumeration(const std::string& key_system, base::Histogram::kUmaTargetedHistogramFlag)->Add(sample); } -static void EmeUMAHistogramCounts(const std::string& key_system, +static void EmeUMAHistogramCounts(const WebKit::WebString& key_system, const std::string& method, int sample) { // Use the same parameters as UMA_HISTOGRAM_COUNTS. @@ -940,7 +940,7 @@ static void ReportMediaKeyExceptionToUMA( MediaKeyException result_id = MediaKeyExceptionForUMA(e); DCHECK_NE(result_id, kUnknownResultId) << e; EmeUMAHistogramEnumeration( - key_system.utf8(), method, result_id, kMaxMediaKeyException); + key_system, method, result_id, kMaxMediaKeyException); } WebMediaPlayer::MediaKeyException WebMediaPlayerAndroid::generateKeyRequest( @@ -1050,7 +1050,7 @@ WebMediaPlayerAndroid::CancelKeyRequestInternal( } void WebMediaPlayerAndroid::OnKeyAdded(const std::string& session_id) { - EmeUMAHistogramCounts(current_key_system_.utf8(), "KeyAdded", 1); + EmeUMAHistogramCounts(current_key_system_, "KeyAdded", 1); if (media_source_delegate_) media_source_delegate_->NotifyKeyAdded(current_key_system_.utf8()); @@ -1061,7 +1061,7 @@ void WebMediaPlayerAndroid::OnKeyAdded(const std::string& session_id) { void WebMediaPlayerAndroid::OnKeyError(const std::string& session_id, media::MediaKeys::KeyError error_code, int system_code) { - EmeUMAHistogramEnumeration(current_key_system_.utf8(), "KeyError", + EmeUMAHistogramEnumeration(current_key_system_, "KeyError", error_code, media::MediaKeys::kMaxKeyError); client_->keyError( |