Add FaviconHandler test reflecting behavior of bookmarks in incognito

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 449 matching lines @@
   EXPECT_CALL(favicon_service_, SetFavicons(_, _, _, _)).Times(0);
 
   EXPECT_CALL(delegate_, OnFaviconUpdated(_, _, kIconURL16x16, _, _));
 
   RunHandlerWithSimpleFaviconCandidates({kIconURL16x16});
   EXPECT_THAT(delegate_.downloads(), ElementsAre(kIconURL16x16));
   EXPECT_THAT(favicon_service_.fake()->db_requests(),
               ElementsAre(kPageURL, kIconURL16x16));
 }
 
+// Test that the FaviconHandler saves a favicon if the page is bookmarked, even
+// in incognito.
+TEST_F(FaviconHandlerTest, DownloadBookmarkedFaviconInIncognito) {
+  ON_CALL(delegate_, IsOffTheRecord()).WillByDefault(Return(true));
+  ON_CALL(delegate_, IsBookmarked(kPageURL)).WillByDefault(Return(true));
+
+  EXPECT_CALL(favicon_service_, UpdateFaviconMappingsAndFetch(_, _, _, _, _, _))
+      .Times(0);
+
+  EXPECT_CALL(favicon_service_, SetFavicons(_, kIconURL16x16, _, _));
+

[pkotwicz, 2017/04/05 15:19:42]

Can you please add:

EXPECT_THAT(delegate_.downloads(), ElementsAre(kIconURL16x16));

[mastiz, 2017/04/06 08:17:53]

Done. Can you please elaborate why this verification is relevant for this test,
or why it is different to db_requests()?

[pkotwicz, 2017/04/06 14:46:02]

It is relevant to the test because "the downloaded favicon" is what is saved to
the database via SetFavicons().

[mastiz, 2017/04/06 14:56:56]

Acknowledged, thx.

+  RunHandlerWithSimpleFaviconCandidates({kIconURL16x16});
+}
+
 // Test that the icon is redownloaded if the icon cached for the page URL
 // expired.
 TEST_F(FaviconHandlerTest, RedownloadExpiredPageUrlFavicon) {
   favicon_service_.fake()->Store(
       kPageURL, kIconURL16x16,
       CreateRawBitmapResult(kIconURL16x16, FAVICON, /*expired=*/true));
 
   // TODO(crbug.com/700811): It would be nice if we could check whether the two
   // OnFaviconUpdated() calls are called with different gfx::Images (as opposed
   // to calling OnFaviconUpdated() with the expired gfx::Image both times).
@@ skipping 526 matching lines @@
 
   RunHandlerWithCandidates(
       FaviconDriverObserver::NON_TOUCH_LARGEST,
       {FaviconURL(kIconURL10x10, FAVICON, SizeVector{gfx::Size(16, 16)}),
        FaviconURL(kIconURL12x12, FAVICON, SizeVector{gfx::Size(15, 15)}),
        FaviconURL(kIconURL16x16, FAVICON, kEmptySizes)});
 }
 
 }  // namespace
 }  // namespace favicon