NTP: Record TileType metrics also on desktop

components/ntp_tiles/metrics_unittest.cc

 // Copyright 2016 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 "components/ntp_tiles/metrics.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 72 matching lines @@
               ElementsAre(base::Bucket(/*min=*/3, /*count=*/1),
                           base::Bucket(/*min=*/4, /*count=*/1),
                           base::Bucket(/*min=*/7, /*count=*/1)));
   EXPECT_THAT(histogram_tester.GetAllSamples(
                   "NewTabPage.SuggestionsImpression.IconsGray"),
               ElementsAre(base::Bucket(/*min=*/6, /*count=*/1)));
 }
 
 TEST(RecordPageImpressionTest, ShouldRecordUmaForThumbnails) {
   base::HistogramTester histogram_tester;
-  RecordPageImpression({{TileSource::TOP_SITES, THUMBNAIL, GURL()},
+  RecordPageImpression({{TileSource::TOP_SITES, THUMBNAIL_FAILED, GURL()},
                         {TileSource::SUGGESTIONS_SERVICE, THUMBNAIL, GURL()},
                         {TileSource::POPULAR, THUMBNAIL, GURL()}},
                        /*rappor_service=*/nullptr);
   EXPECT_THAT(histogram_tester.GetAllSamples("NewTabPage.NumberOfTiles"),
               ElementsAre(base::Bucket(/*min=*/3, /*count=*/1)));
   EXPECT_THAT(
       histogram_tester.GetAllSamples("NewTabPage.SuggestionsImpression"),
       ElementsAre(base::Bucket(/*min=*/0, /*count=*/1),
                   base::Bucket(/*min=*/1, /*count=*/1),
                   base::Bucket(/*min=*/2, /*count=*/1)));
   EXPECT_THAT(
       histogram_tester.GetAllSamples("NewTabPage.SuggestionsImpression.server"),
       ElementsAre(base::Bucket(/*min=*/1, /*count=*/1)));
   EXPECT_THAT(
       histogram_tester.GetAllSamples("NewTabPage.SuggestionsImpression.client"),
       ElementsAre(base::Bucket(/*min=*/0, /*count=*/1)));
   EXPECT_THAT(histogram_tester.GetAllSamples(
                   "NewTabPage.SuggestionsImpression.popular"),
               ElementsAre(base::Bucket(/*min=*/2, /*count=*/1)));
-  EXPECT_THAT(histogram_tester.GetAllSamples("NewTabPage.TileType"), IsEmpty());
+  EXPECT_THAT(histogram_tester.GetAllSamples("NewTabPage.TileType"),
+              ElementsAre(base::Bucket(/*min=*/THUMBNAIL, /*count=*/2),
+                          base::Bucket(/*min=*/THUMBNAIL_FAILED, /*count=*/1)));
   EXPECT_THAT(histogram_tester.GetAllSamples("NewTabPage.TileType.server"),
-              IsEmpty());
+              ElementsAre(base::Bucket(/*min=*/THUMBNAIL, /*count=*/1)));
   EXPECT_THAT(histogram_tester.GetAllSamples("NewTabPage.TileType.client"),
-              IsEmpty());
+              ElementsAre(base::Bucket(/*min=*/THUMBNAIL_FAILED, /*count=*/1)));
   EXPECT_THAT(histogram_tester.GetAllSamples("NewTabPage.TileType.popular"),
-              IsEmpty());
+              ElementsAre(base::Bucket(/*min=*/THUMBNAIL, /*count=*/1)));
   EXPECT_THAT(histogram_tester.GetAllSamples(
                   "NewTabPage.SuggestionsImpression.IconsReal"),
               IsEmpty());
   EXPECT_THAT(histogram_tester.GetAllSamples(
                   "NewTabPage.SuggestionsImpression.IconsColor"),
               IsEmpty());
   EXPECT_THAT(histogram_tester.GetAllSamples(
                   "NewTabPage.SuggestionsImpression.IconsGray"),
               IsEmpty());
 }
@@ skipping 32 matching lines @@
       IsEmpty());
 }
 
 TEST(RecordPageImpressionTest, ShouldRecordRappor) {
   rappor::TestRapporServiceImpl rappor_service;
 
   RecordPageImpression(
       {{TileSource::TOP_SITES, ICON_REAL, GURL("http://www.site1.com/")},
        {TileSource::TOP_SITES, ICON_COLOR, GURL("http://www.site2.com/")},
        {TileSource::TOP_SITES, ICON_DEFAULT, GURL("http://www.site3.com/")},
-       {TileSource::TOP_SITES, THUMBNAIL, GURL("http://www.site4.com/")}},
+       {TileSource::TOP_SITES, UNKNOWN_TILE_TYPE, GURL("http://www.s4.com/")}},

[sfiera, 2017/04/06 08:53:28]

Can this be its own test, instead of hiding it in the Rappor test?

[Marc Treib, 2017/04/06 09:16:44]

Sure, done. I've also updated/expanded the tests above a bit.

       &rappor_service);
 
-  // Thumbnail shouldn't get reported.
+  // Unknown tile type shouldn't get reported.
   EXPECT_EQ(3, rappor_service.GetReportsCount());
 
   {
     std::string sample;
     rappor::RapporType type;
     EXPECT_TRUE(rappor_service.GetRecordedSampleForMetric(
         "NTP.SuggestionsImpressions.IconsReal", &sample, &type));
     EXPECT_EQ("site1.com", sample);
     EXPECT_EQ(rappor::ETLD_PLUS_ONE_RAPPOR_TYPE, type);
   }
@@ skipping 13 matching lines @@
     EXPECT_TRUE(rappor_service.GetRecordedSampleForMetric(
         "NTP.SuggestionsImpressions.IconsGray", &sample, &type));
     EXPECT_EQ("site3.com", sample);
     EXPECT_EQ(rappor::ETLD_PLUS_ONE_RAPPOR_TYPE, type);
   }
 }
 
 }  // namespace
 }  // namespace metrics
 }  // namespace ntp_tiles