Revert of [Autofill] Sort profiles and credit cards by frecency in PaymentRequest.

chrome/browser/autofill/android/personal_data_manager_android.cc

 // Copyright 2013 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/autofill/android/personal_data_manager_android.h"
 
 #include <stddef.h>
-#include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time/time.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_type.h"
@@ skipping 253 matching lines @@
     : weak_java_obj_(env, obj),
       personal_data_manager_(PersonalDataManagerFactory::GetForProfile(
           ProfileManager::GetActiveUserProfile())) {
   personal_data_manager_->AddObserver(this);
 }
 
 PersonalDataManagerAndroid::~PersonalDataManagerAndroid() {
   personal_data_manager_->RemoveObserver(this);
 }
 
-ScopedJavaLocalRef<jobjectArray>
-PersonalDataManagerAndroid::GetProfileGUIDsForSettings(
-    JNIEnv* env,
+jint PersonalDataManagerAndroid::GetProfileCount(
+    JNIEnv* unused_env,
     const JavaParamRef<jobject>& unused_obj) {
-  return GetProfileGUIDs(env, personal_data_manager_->GetProfiles());
+  return personal_data_manager_->GetProfiles().size();
 }
 
-ScopedJavaLocalRef<jobjectArray>
-PersonalDataManagerAndroid::GetProfileGUIDsToSuggest(
+ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByIndex(
     JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj) {
-  return GetProfileGUIDs(env, personal_data_manager_->GetProfilesToSuggest());
+    const JavaParamRef<jobject>& unused_obj,
+    jint index) {
+  const std::vector<AutofillProfile*>& profiles =
+      personal_data_manager_->GetProfiles();
+  size_t index_size_t = static_cast<size_t>(index);
+  DCHECK_LT(index_size_t, profiles.size());
+  return CreateJavaProfileFromNative(env, *profiles[index_size_t]);
 }
 
 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByGUID(
     JNIEnv* env,
     const JavaParamRef<jobject>& unused_obj,
     const JavaParamRef<jstring>& jguid) {
   AutofillProfile* profile = personal_data_manager_->GetProfileByGUID(
       ConvertJavaStringToUTF8(env, jguid));
   if (!profile)
     return ScopedJavaLocalRef<jobject>();
@@ skipping 15 matching lines @@
   if (guid.empty()) {
     personal_data_manager_->AddProfile(profile);
   } else {
     profile.set_guid(guid);
     personal_data_manager_->UpdateProfile(profile);
   }
 
   return ConvertUTF8ToJavaString(env, profile.guid());
 }
 
-ScopedJavaLocalRef<jobjectArray>
-PersonalDataManagerAndroid::GetProfileLabelsForSettings(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj) {
-  return GetProfileLabels(env, false, personal_data_manager_->GetProfiles());
-}
-
-ScopedJavaLocalRef<jobjectArray>
-PersonalDataManagerAndroid::GetProfileLabelsToSuggest(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj) {
-  return GetProfileLabels(env, true,
-                          personal_data_manager_->GetProfilesToSuggest());
-}
-
-base::android::ScopedJavaLocalRef<jobjectArray>
-PersonalDataManagerAndroid::GetCreditCardGUIDsForSettings(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& unused_obj) {
-  return GetCreditCardGUIDs(env, personal_data_manager_->GetCreditCards());
-}
-
-base::android::ScopedJavaLocalRef<jobjectArray>
-PersonalDataManagerAndroid::GetCreditCardGUIDsToSuggest(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& unused_obj) {
-  return GetCreditCardGUIDs(env,
-                            personal_data_manager_->GetCreditCardsToSuggest());
-}
-
-ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByGUID(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& jguid) {
-  CreditCard* card = personal_data_manager_->GetCreditCardByGUID(
-          ConvertJavaStringToUTF8(env, jguid));
-  if (!card)
-    return ScopedJavaLocalRef<jobject>();
-
-  return CreateJavaCreditCardFromNative(env, *card);
-}
-
-ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetCreditCard(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jobject>& jcard) {
-  std::string guid = ConvertJavaStringToUTF8(
-       env,
-       Java_CreditCard_getGUID(env, jcard).obj());
-
-  CreditCard card;
-  PopulateNativeCreditCardFromJava(jcard, env, &card);
-
-  if (guid.empty()) {
-    personal_data_manager_->AddCreditCard(card);
-  } else {
-    card.set_guid(guid);
-    personal_data_manager_->UpdateCreditCard(card);
-  }
-  return ConvertUTF8ToJavaString(env, card.guid());
-}
-
-void PersonalDataManagerAndroid::AddServerCreditCardForTest(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& unused_obj,
-    const base::android::JavaParamRef<jobject>& jcard) {
-  std::unique_ptr<CreditCard> card(new CreditCard);
-  PopulateNativeCreditCardFromJava(jcard, env, card.get());
-  card->set_record_type(CreditCard::MASKED_SERVER_CARD);
-  personal_data_manager_->AddServerCreditCardForTest(std::move(card));
-}
-
-void PersonalDataManagerAndroid::RemoveByGUID(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& jguid) {
-  personal_data_manager_->RemoveByGUID(ConvertJavaStringToUTF8(env, jguid));
-}
-
-void PersonalDataManagerAndroid::ClearUnmaskedCache(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& guid) {
-  personal_data_manager_->ResetFullServerCard(
-      ConvertJavaStringToUTF8(env, guid));
-}
-
-void PersonalDataManagerAndroid::GetFullCardForPaymentRequest(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jobject>& jweb_contents,
-    const JavaParamRef<jstring>& jguid,
-    const JavaParamRef<jobject>& jdelegate) {
-  // Self-deleting object.
-  (new FullCardRequester())
-      ->GetFullCard(env, jweb_contents, jdelegate,
-                    personal_data_manager_->GetCreditCardByGUID(
-                        ConvertJavaStringToUTF8(env, jguid)));
-}
-
-void PersonalDataManagerAndroid::OnPersonalDataChanged() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  if (weak_java_obj_.get(env).is_null())
-    return;
-
-  Java_PersonalDataManager_personalDataChanged(env,
-                                               weak_java_obj_.get(env).obj());
-}
-
-// static
-bool PersonalDataManagerAndroid::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-void PersonalDataManagerAndroid::SetProfileUseStatsForTesting(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& jguid,
-    jint count,
-    jint date) {
-  DCHECK(count >= 0 && date >= 0);
-
-  AutofillProfile* profile = personal_data_manager_->GetProfileByGUID(
-      ConvertJavaStringToUTF8(env, jguid));
-  if (!profile)
-    return;
-
-  profile->set_use_count(static_cast<size_t>(count));
-  profile->set_use_date(base::Time::FromTimeT(date));
-}
-
-void PersonalDataManagerAndroid::SetCreditCardUseStatsForTesting(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& jguid,
-    jint count,
-    jint date) {
-  DCHECK(count >= 0 && date >= 0);
-
-  CreditCard* card = personal_data_manager_->GetCreditCardByGUID(
-      ConvertJavaStringToUTF8(env, jguid));
-  if (!card)
-    return;
-
-  card->set_use_count(static_cast<size_t>(count));
-  card->set_use_date(base::Time::FromTimeT(date));
-}
-
-ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileGUIDs(
-    JNIEnv* env,
-    const std::vector<AutofillProfile*>& profiles) {
-  std::vector<base::string16> guids;
-  for (AutofillProfile* profile : profiles)
-    guids.push_back(base::UTF8ToUTF16(profile->guid()));
-
-  return base::android::ToJavaArrayOfStrings(env, guids);
-}
-
-ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetCreditCardGUIDs(
-    JNIEnv* env,
-    const std::vector<CreditCard*>& credit_cards) {
-  std::vector<base::string16> guids;
-  for (CreditCard* credit_card : credit_cards)
-    guids.push_back(base::UTF8ToUTF16(credit_card->guid()));
-
-  return base::android::ToJavaArrayOfStrings(env, guids);
-}
-
 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels(
     JNIEnv* env,
-    bool address_only,
-    std::vector<AutofillProfile*> profiles) {
+    const JavaParamRef<jobject>& unused_obj,
+    bool address_only) {
   std::unique_ptr<std::vector<ServerFieldType>> suggested_fields;
   size_t minimal_fields_shown = 2;
   if (address_only) {
     suggested_fields.reset(new std::vector<ServerFieldType>);
     suggested_fields->push_back(COMPANY_NAME);
     suggested_fields->push_back(ADDRESS_HOME_LINE1);
     suggested_fields->push_back(ADDRESS_HOME_LINE2);
     suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY);
     suggested_fields->push_back(ADDRESS_HOME_CITY);
     suggested_fields->push_back(ADDRESS_HOME_STATE);
     suggested_fields->push_back(ADDRESS_HOME_ZIP);
     suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE);
     suggested_fields->push_back(ADDRESS_HOME_COUNTRY);
     minimal_fields_shown = suggested_fields->size();
   }
 
   std::vector<base::string16> labels;
   AutofillProfile::CreateInferredLabels(
-      profiles, suggested_fields.get(), NAME_FULL, minimal_fields_shown,
-      g_browser_process->GetApplicationLocale(), &labels);
+      personal_data_manager_->GetProfiles(), suggested_fields.get(), NAME_FULL,
+      minimal_fields_shown, g_browser_process->GetApplicationLocale(), &labels);
 
   return base::android::ToJavaArrayOfStrings(env, labels);
 }
 
+jint PersonalDataManagerAndroid::GetCreditCardCount(
+    JNIEnv* unused_env,
+    const JavaParamRef<jobject>& unused_obj) {
+  return personal_data_manager_->GetCreditCards().size();
+}
+
+ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByIndex(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& unused_obj,
+    jint index) {
+  const std::vector<CreditCard*>& credit_cards =
+      personal_data_manager_->GetCreditCards();
+  size_t index_size_t = static_cast<size_t>(index);
+  DCHECK_LT(index_size_t, credit_cards.size());
+  return CreateJavaCreditCardFromNative(env, *credit_cards[index_size_t]);
+}
+
+ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByGUID(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& unused_obj,
+    const JavaParamRef<jstring>& jguid) {
+  CreditCard* card = personal_data_manager_->GetCreditCardByGUID(
+          ConvertJavaStringToUTF8(env, jguid));
+  if (!card)
+    return ScopedJavaLocalRef<jobject>();
+
+  return CreateJavaCreditCardFromNative(env, *card);
+}
+
+ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetCreditCard(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& unused_obj,
+    const JavaParamRef<jobject>& jcard) {
+  std::string guid = ConvertJavaStringToUTF8(
+       env,
+       Java_CreditCard_getGUID(env, jcard).obj());
+
+  CreditCard card;
+  PopulateNativeCreditCardFromJava(jcard, env, &card);
+
+  if (guid.empty()) {
+    personal_data_manager_->AddCreditCard(card);
+  } else {
+    card.set_guid(guid);
+    personal_data_manager_->UpdateCreditCard(card);
+  }
+  return ConvertUTF8ToJavaString(env, card.guid());
+}
+
+void PersonalDataManagerAndroid::AddServerCreditCardForTest(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& unused_obj,
+    const base::android::JavaParamRef<jobject>& jcard) {
+  std::unique_ptr<CreditCard> card(new CreditCard);
+  PopulateNativeCreditCardFromJava(jcard, env, card.get());
+  card->set_record_type(CreditCard::MASKED_SERVER_CARD);
+  personal_data_manager_->AddServerCreditCardForTest(std::move(card));
+}
+
+void PersonalDataManagerAndroid::RemoveByGUID(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& unused_obj,
+    const JavaParamRef<jstring>& jguid) {
+  personal_data_manager_->RemoveByGUID(ConvertJavaStringToUTF8(env, jguid));
+}
+
+void PersonalDataManagerAndroid::ClearUnmaskedCache(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& unused_obj,
+    const JavaParamRef<jstring>& guid) {
+  personal_data_manager_->ResetFullServerCard(
+      ConvertJavaStringToUTF8(env, guid));
+}
+
+void PersonalDataManagerAndroid::GetFullCardForPaymentRequest(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& unused_obj,
+    const JavaParamRef<jobject>& jweb_contents,
+    const JavaParamRef<jstring>& jguid,
+    const JavaParamRef<jobject>& jdelegate) {
+  // Self-deleting object.
+  (new FullCardRequester())
+      ->GetFullCard(env, jweb_contents, jdelegate,
+                    personal_data_manager_->GetCreditCardByGUID(
+                        ConvertJavaStringToUTF8(env, jguid)));
+}
+
+void PersonalDataManagerAndroid::OnPersonalDataChanged() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  if (weak_java_obj_.get(env).is_null())
+    return;
+
+  Java_PersonalDataManager_personalDataChanged(env,
+                                               weak_java_obj_.get(env).obj());
+}
+
+// static
+bool PersonalDataManagerAndroid::Register(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
 // Returns whether the Autofill feature is enabled.
 static jboolean IsAutofillEnabled(JNIEnv* env,
                                   const JavaParamRef<jclass>& clazz) {
   return GetPrefs()->GetBoolean(autofill::prefs::kAutofillEnabled);
 }
 
 // Enables or disables the Autofill feature.
 static void SetAutofillEnabled(JNIEnv* env,
                                const JavaParamRef<jclass>& clazz,
                                jboolean enable) {
@@ skipping 31 matching lines @@
                base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill