[ImportantSites] JNI bindings for CBD filtering and Important Sites.

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 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/pref_service_bridge.h"
 
 #include <jni.h>
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
+#include "chrome/browser/android/preferences/important_sites_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
+#include "chrome/browser/browsing_data/browsing_data_filter_builder.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
+#include "chrome/browser/browsing_data/registrable_domain_filter_builder.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/android/android_about_app_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/locale_settings.h"
@@ skipping 18 matching lines @@
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using base::android::ScopedJavaGlobalRef;
 using content::BrowserThread;
 
 namespace {
+const size_t kMaxImportantSites = 5;
 
 Profile* GetOriginalProfile() {
   return ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
 }
 
 bool GetBooleanForContentSetting(ContentSettingsType type) {
   HostContentSettingsMap* content_settings =
       HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   switch (content_settings->GetDefaultContentSetting(type, NULL)) {
     case CONTENT_SETTING_BLOCK:
@@ skipping 475 matching lines @@
 
 static void SetBrowsingDataDeletionTimePeriod(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint time_period) {
   DCHECK_GE(time_period, 0);
   DCHECK_LE(time_period, BrowsingDataRemover::TIME_PERIOD_LAST);
   GetPrefService()->SetInteger(prefs::kDeleteTimePeriod, time_period);
 }
 
-static void ClearBrowsingData(JNIEnv* env,
-                              const JavaParamRef<jobject>& obj,
-                              const JavaParamRef<jintArray>& data_types,
-                              jint time_period) {
+static void ClearBrowsingData(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jintArray>& data_types,
+    jint time_period,
+    const JavaParamRef<jobjectArray>& excluding_domains) {
   BrowsingDataRemover* browsing_data_remover =
       BrowsingDataRemoverFactory::GetForBrowserContext(GetOriginalProfile());
   // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is
   // done.
   new ClearBrowsingDataObserver(env, obj, browsing_data_remover);
 
   std::vector<int> data_types_vector;
   base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector);
 
   int remove_mask = 0;
@@ skipping 16 matching lines @@
         remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
         break;
       case BOOKMARKS:
         // Bookmarks are deleted separately on the Java side.
         NOTREACHED();
         break;
       case NUM_TYPES:
         NOTREACHED();
     }
   }
+  std::vector<std::string> cpp_excluding_domains;

[Ted C, 2016/04/21 20:18:16]

I would say the common naming scheme would be to call the java param
jexcluding_domains then this would be just excluding_domains

[dmurph, 2016/04/22 18:06:22]

Done.

+  base::android::AppendJavaStringArrayToStringVector(
+      env, excluding_domains.obj(), &cpp_excluding_domains);
+  RegistrableDomainFilterBuilder filter_builder(
+      BrowsingDataFilterBuilder::BLACKLIST);
+  for (const std::string& domain : cpp_excluding_domains) {
+    filter_builder.AddRegisterableDomain(domain);
+  }
 
-  browsing_data_remover->Remove(
+  browsing_data_remover->RemoveWithFilter(
       BrowsingDataRemover::Period(
           static_cast<BrowsingDataRemover::TimePeriod>(time_period)),
-      remove_mask, BrowsingDataHelper::UNPROTECTED_WEB);
+      remove_mask, BrowsingDataHelper::UNPROTECTED_WEB, filter_builder);
 }
 
 static jboolean CanDeleteBrowsingHistory(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory);
 }
 
+static void FetchImportantSites(JNIEnv* env, const JavaParamRef<jobject>& obj) {
+  std::vector<std::string> important_domains =
+      ImportantSitesUtil::GetImportantRegisterableDomains(GetOriginalProfile(),

[Ted C, 2016/04/21 20:18:16]

is this guaranteed to be fast?  looks "scary-ish" to be done on the UI thread,
but maybe it is all in memory/quick/etc...

[dmurph, 2016/04/21 20:31:23]

It's all in memory. If we ever need to hit disk (which we may need to soon),
then I'll be putting this on a different thread. But we have the callback set up
to handle this asynchronous behavior.

+                                                          kMaxImportantSites);
+  ScopedJavaLocalRef<jobjectArray> string_array =
+      base::android::ToJavaArrayOfStrings(env, important_domains);
+  Java_PrefServiceBridge_importantSitesFetched(env, obj.obj(),

[Ted C, 2016/04/21 20:18:16]

Looking at the java side, I expected this to be an async call since you are
tracking a callback.  why not just return the string list instead of taking a
callback?

It is a bit clearer from an API standpoint and you wouldn't get unexpected
timing issues w/ the immediate callback triggered here.

[dmurph, 2016/04/21 20:31:23]

I expect this call to not always be synchronous, so I'd rather make the API
support that right away.

[Ted C, 2016/04/21 21:23:39]

Then a couple things.

1.) Pass down the java callback to native and track it along with the request. 
Having it a one at a time thing in java land is gross and following clear
browsing isn't what I would do.

2.) Post the callback in the javaside for now to ensure it is infact async
because otherwise the callers might not be happy with what happens.

[dmurph, 2016/04/22 18:06:22]

How does this look? I pass the callback down.

[Ted C, 2016/04/22 18:37:48]

Perfect

+                                               string_array.obj());
+}
+
 static void ShowNoticeAboutOtherFormsOfBrowsingHistory(
     ScopedJavaGlobalRef<jobject>* listener,
     bool show) {
   JNIEnv* env = AttachCurrentThread();
   if (!show)
     return;
   Java_OtherFormsOfBrowsingHistoryListener_showNoticeAboutOtherFormsOfBrowsingHistory(
       env, listener->obj());
 }
 
@@ skipping 442 matching lines @@
 
   return ConvertJavaStringToUTF8(android_permission);
 }
 
 static void SetSupervisedUserId(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 const JavaParamRef<jstring>& pref) {
   GetPrefService()->SetString(prefs::kSupervisedUserId,
                               ConvertJavaStringToUTF8(env, pref));
 }