Create an autofill Suggestion class

components/autofill/core/browser/personal_data_manager.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 
 class PrefService;
 class RemoveAutofillTester;
 
 namespace autofill {
 class AutofillInteractiveTest;
@@ skipping 10 matching lines @@
 
 namespace autofill {
 
 // Handles loading and saving Autofill profile information to the web database.
 // This class also stores the profiles loaded from the database for use during
 // Autofill.
 class PersonalDataManager : public KeyedService,
                             public WebDataServiceConsumer,
                             public AutofillWebDataServiceObserverOnUIThread {
  public:
-  // A pair of GUID and variant index. Represents a single FormGroup and a
-  // specific data variant.
-  typedef std::pair<std::string, size_t> GUIDPair;
-
   explicit PersonalDataManager(const std::string& app_locale);
   ~PersonalDataManager() override;
 
   // Kicks off asynchronous loading of profiles and credit cards.
   // |pref_service| must outlive this instance.  |is_off_the_record| informs
   // this instance whether the user is currently operating in an off-the-record
   // context.
   void Init(scoped_refptr<AutofillWebDataService> database,
             PrefService* pref_service,
             bool is_off_the_record);
@@ skipping 74 matching lines @@
   // part the user has already typed. |field_is_autofilled| is true if the field
   // has already been autofilled. |other_field_types| represents the rest of
   // form. |filter| is run on each potential suggestion. If |filter| returns
   // true, the profile added to the last four outparams (else it's omitted).
   void GetProfileSuggestions(
       const AutofillType& type,
       const base::string16& field_contents,
       bool field_is_autofilled,
       const std::vector<ServerFieldType>& other_field_types,
       const base::Callback<bool(const AutofillProfile&)>& filter,
-      std::vector<base::string16>* values,
-      std::vector<base::string16>* labels,
-      std::vector<base::string16>* icons,
-      std::vector<GUIDPair>* guid_pairs);
+      std::vector<Suggestion>* suggestions);

[Evan Stade, 2014/12/10 23:11:14]

can be a return value now instead of a series of outparams

 
   // Gets credit cards that can suggest data for |type|. See
   // GetProfileSuggestions for argument descriptions. The variant in each
   // GUID pair should be ignored.
   void GetCreditCardSuggestions(
       const AutofillType& type,
       const base::string16& field_contents,
-      std::vector<base::string16>* values,
-      std::vector<base::string16>* labels,
-      std::vector<base::string16>* icons,
-      std::vector<GUIDPair>* guid_pairs);
+      std::vector<Suggestion>* suggestions);
 
   // Re-loads profiles and credit cards from the WebDatabase asynchronously.
   // In the general case, this is a no-op and will re-create the same
   // in-memory model as existed prior to the call.  If any change occurred to
   // profiles in the WebDatabase directly, as is the case if the browser sync
   // engine processed a change from the cloud, we will learn of these as a
   // result of this call.
   //
   // Also see SetProfile for more details.
   virtual void Refresh();
@@ skipping 197 matching lines @@
 
   // An observer to listen for changes to prefs::kAutofillEnabled.
   scoped_ptr<BooleanPrefMember> enabled_pref_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_