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

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>
@@ skipping 632 matching lines @@
 }
 
 static jboolean CanDeleteBrowsingHistory(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory);
 }
 
 static void FetchImportantSites(JNIEnv* env,
                                 const JavaParamRef<jclass>& clazz,
                                 const JavaParamRef<jobject>& java_callback) {
+  std::vector<GURL> example_origins;
   std::vector<std::string> important_domains =
-      ImportantSitesUtil::GetImportantRegisterableDomains(GetOriginalProfile(),
-                                                          kMaxImportantSites);
-  ScopedJavaLocalRef<jobjectArray> string_array =
+      ImportantSitesUtil::GetImportantRegisterableDomains(
+          GetOriginalProfile(), kMaxImportantSites, &example_origins);
+  ScopedJavaLocalRef<jobjectArray> java_domains =
       base::android::ToJavaArrayOfStrings(env, important_domains);
+
+  // We reuse the important domains vector to convert example origins to string.

[Theresa, 2016/05/25 18:14:27]

nit: s/string/strings

[dmurph, 2016/05/25 20:32:23]

done.

+  important_domains.resize(example_origins.size());
+  std::transform(example_origins.begin(), example_origins.end(),
+                 important_domains.begin(),
+                 [](const GURL& origin) { return origin.spec(); });
+  ScopedJavaLocalRef<jobjectArray> java_origins =
+      base::android::ToJavaArrayOfStrings(env, important_domains);
+
   Java_ImportantSitesCallback_onImportantRegisterableDomainsReady(
-      env, java_callback.obj(), string_array.obj());
+      env, java_callback.obj(), java_domains.obj(), java_origins.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) {
   JNIEnv* env = AttachCurrentThread();
   UMA_HISTOGRAM_BOOLEAN(
       "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated", show);
   if (!show)
     return;
@@ skipping 462 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));
 }