Integrate SiteEngagementEvictionPolicy with QuotaManager.

chrome/browser/engagement/site_engagement_eviction_policy.cc

 // Copyright 2015 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 "base/barrier_closure.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/engagement/site_engagement_eviction_policy.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
+base::Callback<SiteEngagementScoreProvider*(content::BrowserContext*)>*
+    g_test_score_provider_callback = nullptr;
+
 const int kExpectedEngagementSites = 200;
 
 // Gets the quota that an origin deserves based on its site engagement.
 int64 GetSoftQuotaForOrigin(const GURL& origin,
                             int score,
                             int total_engagement_points,
                             int64 global_quota) {
   double quota_per_point =
       global_quota /
       std::max(kExpectedEngagementSites * SiteEngagementScore::kMaxPoints,
@@ skipping 32 matching lines @@
 
     // |overuse| can be negative if the soft quota exceeds the usage.
     int64 overuse = usage.second - GetSoftQuotaForOrigin(
                                        origin, score_provider->GetScore(origin),
                                        total_engagement_points, global_quota);
     if (overuse > max_overuse) {
       max_overuse = overuse;
       origin_to_evict = origin;
     }
   }
+
   return origin_to_evict;
 }
 
 GURL GetSiteEngagementEvictionOriginOnUIThread(
     const scoped_refptr<storage::SpecialStoragePolicy>& special_storage_policy,
     content::BrowserContext* browser_context,
     const std::map<GURL, int64>& usage_map,
     int64 global_quota) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  Profile* profile = Profile::FromBrowserContext(browser_context);
-  SiteEngagementService* service =
-      g_browser_process->profile_manager()->IsValidProfile(profile)
-          ? SiteEngagementService::Get(profile)
-          : nullptr;
-  if (!service)
+
+  SiteEngagementScoreProvider* score_provider = nullptr;
+  if (g_test_score_provider_callback) {
+    score_provider = g_test_score_provider_callback->Run(browser_context);
+  } else {
+    Profile* profile = Profile::FromBrowserContext(browser_context);
+    score_provider =
+        g_browser_process->profile_manager()->IsValidProfile(profile)
+            ? SiteEngagementService::Get(profile)
+            : nullptr;
+  }
+
+  if (!score_provider)
     return GURL();
 
-  return DoCalculateEvictionOrigin(special_storage_policy, service, usage_map,
-                                   global_quota);
+  return DoCalculateEvictionOrigin(special_storage_policy, score_provider,
+                                   usage_map, global_quota);
 }
 
 }  // namespace
 
 SiteEngagementEvictionPolicy::SiteEngagementEvictionPolicy(
     content::BrowserContext* browser_context)
     : browser_context_(browser_context) {}
 
 SiteEngagementEvictionPolicy::~SiteEngagementEvictionPolicy() {}
 
 void SiteEngagementEvictionPolicy::GetEvictionOrigin(
+    scoped_ptr<QuotaEvictionPolicy::Info> info,
     const scoped_refptr<storage::SpecialStoragePolicy>& special_storage_policy,
-    const std::map<GURL, int64>& usage_map,
-    int64 global_quota,
     const storage::GetOriginCallback& callback) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&GetSiteEngagementEvictionOriginOnUIThread,
-                 special_storage_policy, browser_context_, usage_map,
-                 global_quota),
+                 special_storage_policy, browser_context_,
+                 info->origin_usage_map, info->global_quota),

[michaeln, 2015/10/06 00:35:09]

I thought you might have created the |info| struct to avoid copying the map, but
i see it being copied at this point anyway? If you're not going to use the info
struct in that fashion, maybe leave the GetEvictionOrigin() method signature as
is since the struct has very few data members.

[calamity, 2015/10/07 02:42:46]

Done.

       callback);
 }
 
+bool SiteEngagementEvictionPolicy::NeedsOriginUsageMap() {
+  return true;
+}
+
+bool SiteEngagementEvictionPolicy::NeedsGlobalQuota() {
+  return true;
+}
+
 // static
-GURL SiteEngagementEvictionPolicy::CalculateEvictionOrigin(
+void SiteEngagementEvictionPolicy::
+    SetSiteEngagementScoreProviderCallbackForTests(
+        base::Callback<SiteEngagementScoreProvider*(content::BrowserContext*)>*
+            callback) {
+  g_test_score_provider_callback = callback;
+}
+
+// static
+GURL SiteEngagementEvictionPolicy::CalculateEvictionOriginForTests(
     const scoped_refptr<storage::SpecialStoragePolicy>& special_storage_policy,
     SiteEngagementScoreProvider* score_provider,
     const std::map<GURL, int64>& usage_map,
     int64 global_quota) {
   return DoCalculateEvictionOrigin(special_storage_policy, score_provider,
                                    usage_map, global_quota);
 }