Return blank strings for Views Combobox separator items.

ui/views/controls/combobox/combobox_unittest.cc

Index: ui/views/controls/combobox/combobox_unittest.cc
diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc
index ea8d8f537bcb30ff2e01436edb8c031faf1f7113..6b30713d74f8cf7cd7031da2f4ae96acc4aa66ef 100644
--- a/ui/views/controls/combobox/combobox_unittest.cc
+++ b/ui/views/controls/combobox/combobox_unittest.cc
@@ -63,7 +63,8 @@ class TestComboboxModel : public ui::ComboboxModel {
     return 10;
   }
   virtual string16 GetItemAt(int index) OVERRIDE {
-    return string16();
+    DCHECK(!IsItemSeparatorAt(index));
+    return IsItemSeparatorAt(index) ? ASCIIToUTF16("NOTREACHED!") : string16();
   }
   virtual bool IsItemSeparatorAt(int index) OVERRIDE {
     return separators_.find(index) != separators_.end();
@@ -307,4 +308,15 @@ TEST_F(ComboboxTest, SkipMultipleSeparatorsAtEnd) {
   EXPECT_EQ(6, combobox_->selected_index());
 }
 
+TEST_F(ComboboxTest, GetTextForRowTest) {
+  InitCombobox();
+  std::set<int> separators;
+  separators.insert(0);
+  separators.insert(1);
+  separators.insert(9);
+  model_->SetSeparators(separators);
+  for (int i = 0; i < combobox_->GetRowCount(); ++i)
+    EXPECT_TRUE(combobox_->GetTextForRow(i).empty());

[sky, 2013/10/17 20:58:54]

Would be nice if the model here returned something other than an empty string
too.

[msw, 2013/10/17 21:25:46]

Done.

+}
+
 }  // namespace views