EME: Remove all references to `needkey` except the UMA name.

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 66 matching lines @@
 using blink::WebSize;
 using blink::WebString;
 using blink::WebURL;
 using gpu::gles2::GLES2Interface;
 using media::LogHelper;
 using media::MediaLog;
 using media::MediaPlayerAndroid;
 using media::VideoFrame;
 
 namespace {
-// Prefix for histograms related to Encrypted Media Extensions.
-const char* kMediaEme = "Media.EME.";
 
 // Values for Media.Android.IsHttpLiveStreamingMediaPredictionResult UMA.
 // Never reuse values!
 enum MediaTypePredictionResult {
   PREDICTION_RESULT_ALL_CORRECT,
   PREDICTION_RESULT_ALL_INCORRECT,
   PREDICTION_RESULT_PATH_BASED_WAS_BETTER,
   PREDICTION_RESULT_URL_BASED_WAS_BETTER,
   // Must always be larger than the largest logged value.
   PREDICTION_RESULT_MAX
@@ skipping 1384 matching lines @@
     media::EmeInitDataType init_data_type,
     const std::vector<uint8_t>& init_data) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
 
   // Do not fire the "encrypted" event if Encrypted Media is not enabled.
   // EME may not be enabled on Android Jelly Bean.
   if (!blink::WebRuntimeFeatures::isEncryptedMediaEnabled()) {
     return;
   }
 
-  UMA_HISTOGRAM_COUNTS(kMediaEme + std::string("NeedKey"), 1);
+  // TODO(xhwang): Update this UMA name. https://crbug.com/589251
+  UMA_HISTOGRAM_COUNTS("Media.EME.NeedKey", 1);
 
   DCHECK(init_data_type != media::EmeInitDataType::UNKNOWN);
 
   encrypted_client_->encrypted(ConvertToWebInitDataType(init_data_type),
                                init_data.data(), init_data.size());
 }
 
 void WebMediaPlayerAndroid::OnWaitingForDecryptionKey() {
   encrypted_client_->didBlockPlaybackWaitingForKey();
 
@@ skipping 153 matching lines @@
     result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
   } else if (is_hls_url == is_hls) {
     result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
       result, PREDICTION_RESULT_MAX);
 }
 
 }  // namespace content