[Media Router] Use the correct histogram to record sink source.

The incorrect histogram name was being used to record the discovery source for Cast devices. This fixes that and renames the related method accordingly. Bug: 773487 Change-Id: Ib1ca58f7071eda4ccaa87500bb416a10d324634f Reviewed-on: https://chromium-review.googlesource.com/717022 Reviewed-by: Bin Zhao <zhaobin@chromium.org> Commit-Queue: mark a. foltz <mfoltz@chromium.org> Cr-Commit-Position: refs/heads/master@{#508456}
cbchan · Oct 12, 2017 · 5e3220a · 5e3220a
1 parent 4985fe2
commit 5e3220a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc
@@ -500,10 +500,10 @@ void CastMediaSinkServiceImpl::OnChannelOpenSucceeded(
   auto& ip_endpoint = cast_sink.cast_data().ip_endpoint;
   auto sink_it = current_sinks_map_.find(ip_endpoint);
   if (sink_it == current_sinks_map_.end()) {
-    metrics_.RecordResolvedFromSource(sink_source);
+    metrics_.RecordCastSinkDiscoverySource(sink_source);
   } else if (sink_it->second.cast_data().discovered_by_dial &&
              !cast_sink.cast_data().discovered_by_dial) {
-    metrics_.RecordResolvedFromSource(SinkSource::kDialMdns);
+    metrics_.RecordCastSinkDiscoverySource(SinkSource::kDialMdns);
   }
   current_sinks_map_[ip_endpoint] = cast_sink;
 
@@ -527,7 +527,7 @@ void CastMediaSinkServiceImpl::OnDialSinkAdded(const MediaSinkInternal& sink) {
   if (base::ContainsKey(current_sinks_map_, ip_endpoint)) {
     DVLOG(2) << "Sink discovered by mDNS, skip adding [name]: "
              << sink.sink().name();
-    metrics_.RecordResolvedFromSource(SinkSource::kMdnsDial);
+    metrics_.RecordCastSinkDiscoverySource(SinkSource::kMdnsDial);
     return;
   }
 

diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc
@@ -199,15 +199,15 @@ TEST_F(CastMediaSinkServiceImplTest, TestMultipleOnChannelOpenSucceeded) {
       cast_sink2, &socket2, CastMediaSinkServiceImpl::SinkSource::kMdns);
   EXPECT_THAT(
       tester.GetAllSamples(
-          CastDeviceCountMetrics::kHistogramCastCachedSinkResolved),
+          CastDeviceCountMetrics::kHistogramCastDiscoverySinkSource),
       ElementsAre(Bucket(
           static_cast<int>(CastMediaSinkServiceImpl::SinkSource::kMdns), 1)));
 
   media_sink_service_impl_.OnChannelOpenSucceeded(
       cast_sink3, &socket3, CastMediaSinkServiceImpl::SinkSource::kDial);
   EXPECT_THAT(
       tester.GetAllSamples(
-          CastDeviceCountMetrics::kHistogramCastCachedSinkResolved),
+          CastDeviceCountMetrics::kHistogramCastDiscoverySinkSource),
       ElementsAre(
           Bucket(static_cast<int>(CastMediaSinkServiceImpl::SinkSource::kMdns),
                  1),
@@ -220,7 +220,7 @@ TEST_F(CastMediaSinkServiceImplTest, TestMultipleOnChannelOpenSucceeded) {
       cast_sink3, &socket3, CastMediaSinkServiceImpl::SinkSource::kMdns);
   EXPECT_THAT(
       tester.GetAllSamples(
-          CastDeviceCountMetrics::kHistogramCastCachedSinkResolved),
+          CastDeviceCountMetrics::kHistogramCastDiscoverySinkSource),
       ElementsAre(
           Bucket(static_cast<int>(CastMediaSinkServiceImpl::SinkSource::kMdns),
                  1),

diff --git a/chrome/browser/media/router/discovery/media_sink_discovery_metrics.cc b/chrome/browser/media/router/discovery/media_sink_discovery_metrics.cc
@@ -54,8 +54,8 @@ const char CastDeviceCountMetrics::kHistogramCastConnectedDeviceCount[] =
     "MediaRouter.Cast.Discovery.ConnectedDevicesCount";
 const char CastDeviceCountMetrics::kHistogramCastCachedSinksAvailableCount[] =
     "MediaRouter.Cast.Discovery.CachedSinksAvailableCount";
-const char CastDeviceCountMetrics::kHistogramCastCachedSinkResolved[] =
-    "MediaRouter.Cast.Discovery.CachedSinkResolved";
+const char CastDeviceCountMetrics::kHistogramCastDiscoverySinkSource[] =
+    "MediaRouter.Cast.Discovery.SinkSource";
 
 void CastDeviceCountMetrics::RecordDeviceCounts(size_t available_device_count,
                                                 size_t known_device_count) {
@@ -70,9 +70,10 @@ void CastDeviceCountMetrics::RecordCachedSinksAvailableCount(
                            cached_sink_count);
 }
 
-void CastDeviceCountMetrics::RecordResolvedFromSource(SinkSource sink_source) {
+void CastDeviceCountMetrics::RecordCastSinkDiscoverySource(
+    SinkSource sink_source) {
   DCHECK_LT(sink_source, kTotalCount);
-  UMA_HISTOGRAM_ENUMERATION(kHistogramCastCachedSinkResolved, sink_source,
+  UMA_HISTOGRAM_ENUMERATION(kHistogramCastDiscoverySinkSource, sink_source,
                             kTotalCount);
 }
 

diff --git a/chrome/browser/media/router/discovery/media_sink_discovery_metrics.h b/chrome/browser/media/router/discovery/media_sink_discovery_metrics.h
@@ -80,12 +80,12 @@ class CastDeviceCountMetrics : public DeviceCountMetrics {
   static const char kHistogramCastKnownDeviceCount[];
   static const char kHistogramCastConnectedDeviceCount[];
   static const char kHistogramCastCachedSinksAvailableCount[];
-  static const char kHistogramCastCachedSinkResolved[];
+  static const char kHistogramCastDiscoverySinkSource[];
 
   void RecordDeviceCounts(size_t available_device_count,
                           size_t known_device_count) override;
   void RecordCachedSinksAvailableCount(size_t cached_sink_count);
-  void RecordResolvedFromSource(SinkSource sink_source);
+  void RecordCastSinkDiscoverySource(SinkSource sink_source);
 };
 
 class CastAnalytics {