[Storage] Android - ManageSpace UI, Important Origins, and CBD Dialog

chrome/browser/android/preferences/website_preference_bridge.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 "chrome/browser/android/preferences/website_preference_bridge.h"
 
+#include <algorithm>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/browsing_data/local_data_container.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/content_settings/web_site_settings_uma_util.h"
+#include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/storage/storage_info_fetcher.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "jni/WebsitePreferenceBridge_jni.h"
 #include "storage/browser/quota/quota_manager.h"
@@ skipping 618 matching lines @@
 };
 
 class LocalStorageInfoReadyCallback {
  public:
   explicit LocalStorageInfoReadyCallback(const JavaRef<jobject>& java_callback)
       : env_(base::android::AttachCurrentThread()),
         java_callback_(java_callback) {
   }
 
   void OnLocalStorageModelInfoLoaded(
+      Profile* profile,
       const std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo>&
           local_storage_info) {
     ScopedJavaLocalRef<jobject> map =
         Java_WebsitePreferenceBridge_createLocalStorageInfoMap(env_);
+    SiteEngagementService* service = SiteEngagementService::Get(profile);
+    std::map<GURL, double> score_map = service->GetScoreMap();
 
     std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo>::const_iterator
         i;
     for (i = local_storage_info.begin(); i != local_storage_info.end(); ++i) {
       ScopedJavaLocalRef<jstring> full_origin =
           ConvertUTF8ToJavaString(env_, i->origin_url.spec());
+      std::string origin_str = i->origin_url.GetOrigin().spec();
+      double engagement_score = 0;
+      auto engagement_score_it = score_map.find(i->origin_url.GetOrigin());
+      if (engagement_score_it != score_map.end()) {
+        engagement_score = engagement_score_it->second;
+      }
       // Remove the trailing backslash so the origin is matched correctly in
       // SingleWebsitePreferences.mergePermissionInfoForTopLevelOrigin.
-      std::string origin_str = i->origin_url.GetOrigin().spec();
       DCHECK(origin_str[origin_str.size() - 1] == '/');
       origin_str = origin_str.substr(0, origin_str.size() - 1);
       ScopedJavaLocalRef<jstring> origin =
           ConvertUTF8ToJavaString(env_, origin_str);
       Java_WebsitePreferenceBridge_insertLocalStorageInfoIntoMap(
-          env_, map.obj(), origin.obj(), full_origin.obj(), i->size);
+          env_, map.obj(), origin.obj(), full_origin.obj(), i->size,
+          engagement_score);
     }
 
     Java_LocalStorageInfoReadyCallback_onLocalStorageInfoReady(
         env_, java_callback_.obj(), map.obj());
     delete this;
   }
 
  private:
   JNIEnv* env_;
   ScopedJavaGlobalRef<jobject> java_callback_;
 };
 
 }  // anonymous namespace
 
 // TODO(jknotten): These methods should not be static. Instead we should
 // expose a class to Java so that the fetch requests can be cancelled,
 // and manage the lifetimes of the callback (and indirectly the helper
 // by having a reference to it).
 
 // The helper methods (StartFetching, DeleteLocalStorageFile, DeleteDatabase)
 // are asynchronous. A "use after free" error is not possible because the
 // helpers keep a reference to themselves for the duration of their tasks,
 // which includes callback invocation.
 
+static void FetchImportantOriginInfo(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& clazz,
+    const JavaParamRef<jobject>& java_callback) {
+  Profile* profile = ProfileManager::GetActiveUserProfile();
+  ScopedJavaLocalRef<jobject> map =
+      Java_WebsitePreferenceBridge_createImportantOriginInfoMap(env);
+  ScopedJavaLocalRef<jobject> list =
+      Java_WebsitePreferenceBridge_createImportantOriginList(env);
+  SiteEngagementService* service = SiteEngagementService::Get(profile);
+  std::map<GURL, double> score_map = service->GetScoreMap();
+  std::vector<std::pair<GURL, double>> ranked_origins;

[Finnur, 2016/03/03 14:15:44]

Shouldn't this be named top_ranking_origins, or something?

[dmurph, 2016/04/26 21:43:13]

chagned.

+
+  for (const auto& url_engagement_pair : score_map) {
+    if (!service->IsEngagementAtLeast(
+            url_engagement_pair.first,
+            SiteEngagementService::ENGAGEMENT_LEVEL_MEDIUM)) {
+      continue;
+    }
+    ranked_origins.push_back(url_engagement_pair);
+  }
+
+  std::sort(
+      ranked_origins.begin(), ranked_origins.end(),
+      [](const std::pair<GURL, double>& a, const std::pair<GURL, double>& b) {
+        return a.second > b.second;
+      });
+  ranked_origins.resize(std::min(ranked_origins.size(), 5u));

[Finnur, 2016/03/03 14:15:44]

Um... this is non-obvious. Can you add a comment on line 736 explaining what you
are doing, for example:
// Produce a list of the top five highest ranked origins.

... or something.

I also don't quite understand why we have a limit of 5, can you elaborate?

[dmurph, 2016/04/26 21:43:13]

Moved to a separate class in previous patch.

+
+  for (const auto& url_engagement_pair : ranked_origins) {
+    // Remove the trailing backslash so the origin is matched correctly in
+    // SingleWebsitePreferences.mergePermissionInfoForTopLevelOrigin, and with
+    // maps returned in FetchLocalStorageInfo.
+    std::string origin_str = url_engagement_pair.first.GetOrigin().spec();
+    DCHECK(origin_str[origin_str.size() - 1] == '/');
+    origin_str = origin_str.substr(0, origin_str.size() - 1);
+    ScopedJavaLocalRef<jstring> origin =
+        ConvertUTF8ToJavaString(env, origin_str);
+    Java_WebsitePreferenceBridge_insertImportantOriginInfoIntoMap(
+        env, map.obj(), origin.obj(), 0, url_engagement_pair.second);
+    Java_WebsitePreferenceBridge_insertImportantOriginIntoList(env, list.obj(),
+                                                               origin.obj());
+  }
+
+  Java_ImportantOriginsReadyCallback_onImportantOriginsReady(
+      env, java_callback.obj(), list.obj(), map.obj());
+}
+
 static void FetchLocalStorageInfo(JNIEnv* env,
                                   const JavaParamRef<jclass>& clazz,
                                   const JavaParamRef<jobject>& java_callback) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper(
       new BrowsingDataLocalStorageHelper(profile));
   // local_storage_callback will delete itself when it is run.
   LocalStorageInfoReadyCallback* local_storage_callback =
       new LocalStorageInfoReadyCallback(java_callback);
   local_storage_helper->StartFetching(
       base::Bind(&LocalStorageInfoReadyCallback::OnLocalStorageModelInfoLoaded,
-                 base::Unretained(local_storage_callback)));
+                 base::Unretained(local_storage_callback), profile));
 }
 
 static void FetchStorageInfo(JNIEnv* env,
                              const JavaParamRef<jclass>& clazz,
                              const JavaParamRef<jobject>& java_callback) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
 
   // storage_info_ready_callback will delete itself when it is run.
   StorageInfoReadyCallback* storage_info_ready_callback =
       new StorageInfoReadyCallback(java_callback);
@@ skipping 41 matching lines @@
   GURL url(ConvertJavaStringToUTF8(env, jorigin));
   scoped_refptr<SiteDataDeleteHelper> site_data_deleter(
       new SiteDataDeleteHelper(profile, url));
   site_data_deleter->Run();
 }
 
 // Register native methods
 bool RegisterWebsitePreferenceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }