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

chrome/browser/android/preferences/pref_service_bridge.cc

Index: chrome/browser/android/preferences/pref_service_bridge.cc
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index d4bc0a8b85a4041b7aff7dabbe620dadcb12588f..3ade06b5929abcc7a563bcf6dc80a2d976353118 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -632,8 +632,10 @@ static void ClearBrowsingData(
       env, jexcluding_domains.obj(), &excluding_domains);
   RegistrableDomainFilterBuilder filter_builder(
       BrowsingDataFilterBuilder::BLACKLIST);
+  LOG(ERROR) << "Clearing excluding domains: ";

[Theresa, 2016/05/16 22:37:08]

Why was this error log added?

[dmurph, 2016/05/16 23:00:18]

Whoops, forgot to remove. This was for debugging.

   for (const std::string& domain : excluding_domains) {
     filter_builder.AddRegisterableDomain(domain);
+    LOG(ERROR) << domain;
   }
 
   browsing_data_remover->RemoveWithFilter(
@@ -659,6 +661,21 @@ static void FetchImportantSites(JNIEnv* env,
       env, java_callback.obj(), string_array.obj());
 }
 
+static jint GetMaxImportantSites(JNIEnv* env,
+                                 const JavaParamRef<jclass>& clazz) {
+  return kMaxImportantSites;
+}
+
+static void MarkOriginAsImportantForTesting(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& clazz,
+    const JavaParamRef<jstring>& jorigin) {
+  GURL origin(base::android::ConvertJavaStringToUTF8(jorigin));
+  CHECK(origin.is_valid());
+  ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(),
+                                                      origin);
+}
+
 static void ShowNoticeAboutOtherFormsOfBrowsingHistory(
     ScopedJavaGlobalRef<jobject>* listener,
     bool show) {