AutoFill: Display a right-aligned generic CC icon in the suggestions popup for

chrome/renderer/autofill_helper.cc

Index: chrome/renderer/autofill_helper.cc
diff --git a/chrome/renderer/autofill_helper.cc b/chrome/renderer/autofill_helper.cc
index 698a3b342d3e8478f4144d1678eb17f1eaeaf262..1ed6b09d100037c79625301a6acb0f9d87c10727 100644
--- a/chrome/renderer/autofill_helper.cc
+++ b/chrome/renderer/autofill_helper.cc
@@ -66,6 +66,7 @@ void AutoFillHelper::RemoveAutocompleteSuggestion(
 void AutoFillHelper::SuggestionsReceived(int query_id,
                                          const std::vector<string16>& values,
                                          const std::vector<string16>& labels,
+                                         const std::vector<string16>& icons,
                                          const std::vector<int>& unique_ids) {
   WebKit::WebView* web_view = render_view_->webview();
   if (!web_view || query_id != autofill_query_id_)
@@ -80,6 +81,7 @@ void AutoFillHelper::SuggestionsReceived(int query_id,
 
   std::vector<string16> v(values);
   std::vector<string16> l(labels);
+  std::vector<string16> i(icons);
   std::vector<int> ids(unique_ids);
   int separator_index = -1;
 
@@ -88,6 +90,7 @@ void AutoFillHelper::SuggestionsReceived(int query_id,
   if (form_manager_.FormWithNodeIsAutoFilled(autofill_query_node_)) {
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM));
     l.push_back(string16());
+    i.push_back(string16());
     ids.push_back(0);
     suggestions_clear_index_ = v.size() - 1;
     separator_index = values.size();
@@ -106,6 +109,7 @@ void AutoFillHelper::SuggestionsReceived(int query_id,
     // Append the 'AutoFill Options...' menu item.
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS));
     l.push_back(string16());
+    i.push_back(string16());
     ids.push_back(0);
     suggestions_options_index_ = v.size() - 1;
     separator_index = values.size();
@@ -114,7 +118,7 @@ void AutoFillHelper::SuggestionsReceived(int query_id,
   // Send to WebKit for display.
   if (!v.empty()) {
     web_view->applyAutoFillSuggestions(
-        autofill_query_node_, v, l, ids, separator_index);
+        autofill_query_node_, v, l, i, ids, separator_index);
   }
 }