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 58 matching lines @@
 }
 
 std::string SuggestionsMenuModel::GetItemKeyForCheckedItem() const {
   if (items_.empty())
     return std::string();
 
   return items_[checked_item_].first;
 }
 
 void SuggestionsMenuModel::SetCheckedItem(const std::string& item_key) {
-  for (size_t i = 0; i < items_.size(); ++i) {
-    if (items_[i].first == item_key) {
-      checked_item_ = i;
-      return;
-    }
-  }
-
-  NOTREACHED();
+  SetCheckedItemNthWithKey(item_key, 1);
 }
 
 void SuggestionsMenuModel::SetCheckedIndex(size_t index) {
   DCHECK_LE(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].first == item_key) {
+      checked_item_ = i;
+      if (n-- <= 1)

[Ilya Sherman, 2013/05/21 03:54:35]

nit: Please write this as two separate statements, rather than asking me to
think about post-increment vs. pre-increment operators.

[Evan Stade, 2013/05/21 17:34:41]

I don't see anything about this in the style guide. In fact it implicitly
condones it:

"When a variable is incremented (++i or i++) or decremented (--i or i--) <em>and
the value of the expression is not used</em>, one must decide whether to
preincrement (decrement) or postincrement (decrement)."

I don't feel strongly, but my general take on this type of matter is that it
causes confusion if you don't use the shortest form available (i.e. if you break
it out into a separate line, I wonder why that is and probably go back and
re-read to make sure I'm not missing something).

+        return;
+    }
+  }
+}
+
 bool SuggestionsMenuModel::IsCommandIdChecked(
     int command_id) const {
   return checked_item_ == command_id;
 }
 
 bool SuggestionsMenuModel::IsCommandIdEnabled(
     int command_id) const {
   return true;
 }
 
@@ skipping 44 matching lines @@
 }
 
 string16 YearComboboxModel::GetItemAt(int index) {
   if (index == 0)
     return string16();
 
   return base::IntToString16(this_year_ + index - 1);
 }
 
 }  // autofill