Persist the choice of AutofillDataModel when using the requestAutocomplete dialog.

chrome/browser/ui/autofill/autofill_dialog_models.cc

 // Copyright (c) 2012 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/autofill_dialog_models.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 63 matching lines @@
 }
 
 std::string SuggestionsMenuModel::GetItemKeyForCheckedItem() const {
   if (items_.empty())
     return std::string();
 
   return items_[checked_item_].key;
 }
 
 void SuggestionsMenuModel::SetCheckedItem(const std::string& item_key) {
-  checked_item_ = GetItemIndex(item_key);
+  SetCheckedItemNthWithKey(item_key, 1);
 }
 
 void SuggestionsMenuModel::SetCheckedIndex(size_t index) {
   DCHECK_LT(index, items_.size());
   checked_item_ = index;
 }
 
+void SuggestionsMenuModel::SetCheckedItemNthWithKey(const std::string& item_key,
+                                                    size_t n) {
+  for (size_t i = 0; i < items_.size(); ++i) {
+    if (items_[i].key == item_key) {
+      checked_item_ = i;
+      if (n-- <= 1)
+        return;
+    }
+  }
+}
+
 void SuggestionsMenuModel::SetEnabled(const std::string& item_key,
                                       bool enabled) {
   items_[GetItemIndex(item_key)].enabled = enabled;
 }
 
 bool SuggestionsMenuModel::IsCommandIdChecked(
     int command_id) const {
   return checked_item_ == command_id;
 }
 
@@ skipping 62 matching lines @@
 }
 
 string16 YearComboboxModel::GetItemAt(int index) {
   if (index == 0)
     return string16();
 
   return base::IntToString16(this_year_ + index - 1);
 }
 
 }  // autofill