Allow incrementing default sites count

Fix #11043

The problem is that top sites caching keeps the smallest count, so that it doesn't need to consider items that is smaller than that count. But for top sites it is 1, and when added to history it is 0

This change is only for 0.19.x and 0.20.x

Auditors: @cezaraugusto

js/state/siteUtil.js

@@ -251,11 +251,9 @@ const mergeSiteDetails = (oldSiteDetail, newSiteDetail, tag, folderId, order) =>
   if (newSiteDetail.get('themeColor') || (oldSiteDetail && oldSiteDetail.get('themeColor'))) {
     site = site.set('themeColor', newSiteDetail.get('themeColor') || oldSiteDetail.get('themeColor'))
   }
-  if (site.get('tags').size === 0) {
-    // Increment the visit count for history items
+  if (site.get('tags').size === 0 || (site.get('tags').size === 1 && site.getIn(['tags', 0]) === siteTags.DEFAULT)) {
     site = site.set('count', ((oldSiteDetail || site).get('count') || 0) + 1)
   }
-
   return site
 }
 

test/unit/state/siteUtilTest.js

@@ -558,6 +558,16 @@ describe('siteUtil', function () {
         assert.equal(state.getIn(['sites', oldSiteKey, 'skipSync']), true)
       })
     })
+    it('increments count for default default sites', function () {
+      const site = Immutable.fromJS({
+        location: 'https://brave.com',
+        tags: [siteTags.BOOKMARK_FOLDER]
+      })
+      let newState = siteUtil.addSite(Immutable.fromJS({sites: {}}), site, siteTags.DEFAULT)
+      assert.equal(newState.getIn(['sites', 'https://brave.com|0|0', 'count']), 1)
+      newState = siteUtil.addSite(newState, site, siteTags.DEFAULT)
+      assert.equal(newState.getIn(['sites', 'https://brave.com|0|0', 'count']), 2)
+    })
   })
 
   describe('removeSite', function () {