Create an autofill Suggestion class

chrome/browser/ui/autofill/chrome_autofill_client.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/ui/autofill/chrome_autofill_client.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ skipping 125 matching lines @@
     callback.Run(AutofillClient::AutocompleteResultErrorDisabled,
                  base::string16(),
                  NULL);
     NOTIMPLEMENTED();
   }
 }
 
 void ChromeAutofillClient::ShowAutofillPopup(
     const gfx::RectF& element_bounds,
     base::i18n::TextDirection text_direction,
-    const std::vector<base::string16>& values,
-    const std::vector<base::string16>& labels,
-    const std::vector<base::string16>& icons,
-    const std::vector<int>& identifiers,
+    const std::vector<autofill::Suggestion>& suggestions,
     base::WeakPtr<AutofillPopupDelegate> delegate) {
   // Convert element_bounds to be in screen space.
   gfx::Rect client_area = web_contents_->GetContainerBounds();
   gfx::RectF element_bounds_in_screen_space =
       element_bounds + client_area.OffsetFromOrigin();
 
   // Will delete or reuse the old |popup_controller_|.
   popup_controller_ =
       AutofillPopupControllerImpl::GetOrCreate(popup_controller_,
                                                delegate,
                                                web_contents(),
                                                web_contents()->GetNativeView(),
                                                element_bounds_in_screen_space,
                                                text_direction);
 
-  popup_controller_->Show(values, labels, icons, identifiers);
+  popup_controller_->Show(suggestions);
 }
 
 void ChromeAutofillClient::UpdateAutofillPopupDataListValues(
     const std::vector<base::string16>& values,
     const std::vector<base::string16>& labels) {
   if (popup_controller_.get())
     popup_controller_->UpdateDataListValues(values, labels);
 }
 
 void ChromeAutofillClient::HideAutofillPopup() {
@@ skipping 45 matching lines @@
                                                profile_full_name);
 #endif  // defined(OS_ANDROID)
 }
 
 void ChromeAutofillClient::OnFirstUserGestureObserved() {
   web_contents()->SendToAllFrames(
       new AutofillMsg_FirstUserGestureObservedInTab(routing_id()));
 }
 
 }  // namespace autofill