Return blank strings for Views Combobox separator items.

ui/views/controls/combobox/combobox_unittest.cc

 // Copyright 2013 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 "ui/views/controls/combobox/combobox.h"
 
 #include <set>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
@@ skipping 45 matching lines @@
 class TestComboboxModel : public ui::ComboboxModel {
  public:
   TestComboboxModel() {}
   virtual ~TestComboboxModel() {}
 
   // ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE {
     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();
   }
 
   void SetSeparators(const std::set<int>& separators) {
     separators_ = separators;
   }
 
  private:
@@ skipping 223 matching lines @@
   SendKeyEvent(ui::VKEY_HOME);
   EXPECT_EQ(0, combobox_->selected_index());
   SendKeyEvent(ui::VKEY_NEXT);
   EXPECT_EQ(6, combobox_->selected_index());
   SendKeyEvent(ui::VKEY_PRIOR);
   EXPECT_EQ(0, combobox_->selected_index());
   SendKeyEvent(ui::VKEY_END);
   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());

[sky, 2013/10/18 00:35:24]

For loops like this it's best to have << i (or something like that), so that if
there is a failure you know the index.

[msw, 2013/10/18 01:07:58]

Done.

+    else
+      EXPECT_EQ(ASCIIToUTF16("ITEM"), combobox_->GetTextForRow(i));
+  }
+}
+
 }  // namespace views