Add DownloadStatus metric to FaviconHandler

components/favicon/core/favicon_handler_unittest.cc

 // Copyright (c) 2012 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/favicon/core/favicon_handler.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 24 matching lines @@
 using favicon_base::TOUCH_ICON;
 using favicon_base::TOUCH_PRECOMPOSED_ICON;
 using testing::Assign;
 using testing::ElementsAre;
 using testing::InSequence;
 using testing::Invoke;
 using testing::IsEmpty;
 using testing::Return;
 using testing::_;
 
+using DownloadOutcome = FaviconHandler::DownloadOutcome;
 using IntVector = std::vector<int>;
 using URLVector = std::vector<GURL>;
 using BitmapVector = std::vector<SkBitmap>;
 using SizeVector = std::vector<gfx::Size>;
 
 MATCHER_P2(ImageSizeIs, width, height, "") {
   *result_listener << "where size is " << arg.Width() << "x" << arg.Height();
   return arg.Size() == gfx::Size(width, height);
 }
 
@@ skipping 1000 matching lines @@
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.FaviconDownloadAttempts"),
       IsEmpty());
 }
 
 TEST_F(FaviconHandlerTest, TestRecordSingleFaviconDownloadAttempt) {
   base::HistogramTester histogram_tester;
 
   RunHandlerWithCandidates(
       FaviconDriverObserver::NON_TOUCH_16_DIP,
-      {FaviconURL(GURL("http://www.google.com/a"), FAVICON,
+      {FaviconURL(GURL(kIconURL64x64), FAVICON,
                   {gfx::Size(1024, 1024), gfx::Size(512, 512)})});
 
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.FaviconDownloadAttempts"),
       ElementsAre(base::Bucket(/*sample=*/1, /*expected_count=*/1)));
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.LargeIconDownloadAttempts"),
       IsEmpty());
+  EXPECT_THAT(histogram_tester.GetAllSamples("Favicons.DownloadOutcome"),
+              ElementsAre(base::Bucket(DownloadOutcome::SUCCEEDED,
+                                       /*expected_count=*/1)));
 }
 
 TEST_F(FaviconHandlerTest, TestRecordSingleLargeIconDownloadAttempts) {
   base::HistogramTester histogram_tester;
 
   RunHandlerWithCandidates(
       FaviconDriverObserver::NON_TOUCH_LARGEST,
-      {FaviconURL(GURL("http://www.google.com/a"), FAVICON, kEmptySizes)});
+      {FaviconURL(GURL(kIconURL16x16), FAVICON, kEmptySizes)});
 
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.LargeIconDownloadAttempts"),
       ElementsAre(base::Bucket(/*sample=*/1, /*expected_count=*/1)));
 
   // TOUCH_LARGEST fills the same bucket as NON_TOUCH_LARGEST.
   RunHandlerWithCandidates(
       FaviconDriverObserver::TOUCH_LARGEST,
-      {FaviconURL(GURL("http://www.google.com/b"), TOUCH_ICON, kEmptySizes)});
+      {FaviconURL(GURL(kIconURL64x64), TOUCH_ICON, kEmptySizes)});
 
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.LargeIconDownloadAttempts"),
       ElementsAre(base::Bucket(/*sample=*/1, /*expected_count=*/2)));
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.FaviconDownloadAttempts"),
       IsEmpty());
+  EXPECT_THAT(histogram_tester.GetAllSamples("Favicons.DownloadOutcome"),
+              ElementsAre(base::Bucket(DownloadOutcome::SUCCEEDED,
+                                       /*expected_count=*/2)));
 }
 
 TEST_F(FaviconHandlerTest, TestRecordDownloadAttemptsFinishedByCache) {
   // Names represent the bitmap sizes per icon.
   const GURL kIconURL1024_512("http://www.google.com/a");
   const GURL kIconURL15_14("http://www.google.com/b");
   const GURL kIconURL16_512("http://www.google.com/c");
   base::HistogramTester histogram_tester;
   favicon_service_.fake()->Store(
       GURL("http://so.de"), kIconURL16_512,
@@ skipping 15 matching lines @@
   EXPECT_THAT(delegate_.downloads(), ElementsAre(kIconURL1024_512));
 
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.LargeIconDownloadAttempts"),
       ElementsAre(base::Bucket(/*sample=*/1, /*expected_count=*/1)));
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.FaviconDownloadAttempts"),
       IsEmpty());
 }
 
+TEST_F(FaviconHandlerTest, TestRecordSkippedDownloadAttemptAfterFailure) {

[pkotwicz, 2017/04/10 18:30:59]

Can you please split this test into two?
- One test for when UnableToDownloadFavicon(k404IconURL) returns true
- One test for when UnableToDownloadFavicon(k404IconURL) returns false

[fhorschig, 2017/04/11 12:24:53]

Done.

+  base::HistogramTester histogram_tester;
+  const GURL k404IconURL("http://www.google.com/404.png");
+
+  delegate_.fake_downloader().AddError(k404IconURL, 404);
+
+  // When calling an URL for the first time, it should log the failure.
+  EXPECT_CALL(favicon_service_, UnableToDownloadFavicon(k404IconURL));
+
+  RunHandlerWithCandidates(

[pkotwicz, 2017/04/10 18:30:59]

Can you use RunHandlerWithSimpleFaviconCandidates() ?

[fhorschig, 2017/04/11 12:24:53]

Done.

+      FaviconDriverObserver::NON_TOUCH_LARGEST,
+      {FaviconURL(GURL(k404IconURL), FAVICON, kEmptySizes)});
+
+  EXPECT_THAT(
+      histogram_tester.GetAllSamples("Favicons.DownloadOutcome"),
+      ElementsAre(base::Bucket(DownloadOutcome::FAILED, /*expected_count=*/1)));
+
+  // Now, the URL is known to be failing and should be skipped.
+
+  ON_CALL(favicon_service_, WasUnableToDownloadFavicon(k404IconURL))
+      .WillByDefault(Return(true));
+
+  RunHandlerWithCandidates(
+      FaviconDriverObserver::NON_TOUCH_LARGEST,
+      {FaviconURL(GURL(k404IconURL), FAVICON, kEmptySizes)});
+
+  EXPECT_THAT(
+      histogram_tester.GetAllSamples("Favicons.DownloadOutcome"),
+      ElementsAre(
+          base::Bucket(DownloadOutcome::FAILED, /*expected_count=*/1),
+          base::Bucket(DownloadOutcome::SKIPPED, /*expected_count=*/1)));
+}
+
 }  // namespace
 }  // namespace favicon