Remove wstrings from bookmarks, part 12.

- This changes RecentlyUsedFoldersComboModel::GetItemAt() to return a string16
  instead of a wstring.
- This entailed changing the base class, ComboboxModel, and shaving a herd of
  yaks.

BUG=23581
TEST=builds and passes tests

Review URL: http://codereview.chromium.org/3159031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57021 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 2 deletions

diff --git a/chrome/browser/views/autofill_profiles_view_win.h b/chrome/browser/views/autofill_profiles_view_win.h
index 71c5cb8..d11da9e 100644
--- a/chrome/browser/views/autofill_profiles_view_win.h
+++ b/chrome/browser/views/autofill_profiles_view_win.h
@@ -11,6 +11,7 @@
 
 #include "app/combobox_model.h"
 #include "app/table_model.h"
+#include "base/string16.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
@@ -377,7 +378,7 @@ class AutoFillProfilesView : public views::View,
     // Overridden from ComboboxModel:
     // Public as they are used from EditableSetViewContents.
     virtual int GetItemCount();
-    virtual std::wstring GetItemAt(int index);
+    virtual string16 GetItemAt(int index);
 
    private:
     std::list<views::Combobox*> combo_boxes_;
@@ -398,7 +399,7 @@ class AutoFillProfilesView : public views::View,
 
     // Overridden from ComboboxModel:
     virtual int GetItemCount();
-    virtual std::wstring GetItemAt(int index);
+    virtual string16 GetItemAt(int index);
 
     // Find an index of the item in the model, -1 if not present.
     int GetIndex(const std::wstring& value);