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..cd9f4ff543c6a9f52489a49f8604709cfd885271 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 ASCIIToUTF16(IsItemSeparatorAt(index) ? "SEPARATOR" : "ITEM");
   }
   virtual bool IsItemSeparatorAt(int index) OVERRIDE {
     return separators_.find(index) != separators_.end();
@@ -307,4 +308,19 @@ 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) {
+    if (separators.count(i) != 0)
+      EXPECT_TRUE(combobox_->GetTextForRow(i).empty()) << i;
+    else
+      EXPECT_EQ(ASCIIToUTF16("ITEM"), combobox_->GetTextForRow(i)) << i;
+  }
+}
+
 }  // namespace views