[Durable] Updated Durable heuristic to use 'important sites'

chrome/browser/engagement/important_sites_util.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 "chrome/browser/android/preferences/important_sites_util.h"
+#include "chrome/browser/engagement/important_sites_util.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <set>
 #include <utility>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 61 matching lines @@
   CROSSED_ENGAGEMENT = 2,
   CROSSED_NOTIFICATIONS_AND_ENGAGEMENT = 3,
   CROSSED_DURABLE_AND_ENGAGEMENT = 4,
   CROSSED_NOTIFICATIONS_AND_DURABLE = 5,
   CROSSED_NOTIFICATIONS_AND_DURABLE_AND_ENGAGEMENT = 6,
   CROSSED_REASON_UNKNOWN = 7,
   CROSSED_REASON_BOUNDARY
 };
 
 CrossedReason GetCrossedReasonFromBitfield(int32_t reason_bitfield) {
-  bool durable = reason_bitfield & (1 << ImportantReason::DURABLE);
-  bool notifications = reason_bitfield & (1 << ImportantReason::NOTIFICATIONS);
-  bool engagement = reason_bitfield & (1 << ImportantReason::ENGAGEMENT);
+  bool durable = (reason_bitfield & (1 << ImportantReason::DURABLE)) != 0;
+  bool notifications =
+      (reason_bitfield & (1 << ImportantReason::NOTIFICATIONS)) != 0;
+  bool engagement = (reason_bitfield & (1 << ImportantReason::ENGAGEMENT)) != 0;
   if (durable && notifications && engagement)
     return CROSSED_NOTIFICATIONS_AND_DURABLE_AND_ENGAGEMENT;
   else if (notifications && durable)
     return CROSSED_NOTIFICATIONS_AND_DURABLE;
   else if (notifications && engagement)
     return CROSSED_NOTIFICATIONS_AND_ENGAGEMENT;
   else if (durable && engagement)
     return CROSSED_DURABLE_AND_ENGAGEMENT;
   else if (notifications)
     return CROSSED_NOTIFICATIONS;
@@ skipping 323 matching lines @@
   // experiment to give us initial data on what signals actually mattered.
   for (int32_t reason_bitfield : blacklisted_sites_reason_bitfield) {
     UMA_HISTOGRAM_ENUMERATION("Storage.BlacklistedImportantSites.Reason",
                               GetCrossedReasonFromBitfield(reason_bitfield),
                               CROSSED_REASON_BOUNDARY);
   }
 }
 
 void ImportantSitesUtil::MarkOriginAsImportantForTesting(Profile* profile,
                                                          const GURL& origin) {
+  SiteEngagementScore::SetParamValuesForTesting();
   // First get data from site engagement.
   SiteEngagementService* site_engagement_service =
       SiteEngagementService::Get(profile);
   site_engagement_service->ResetScoreForURL(
       origin, SiteEngagementScore::GetMediumEngagementBoundary());
   DCHECK(site_engagement_service->IsEngagementAtLeast(
       origin, SiteEngagementService::ENGAGEMENT_LEVEL_MEDIUM));
 }