views: Rename Combobox "selected getter/setter" accessors to something more accurate.

ui/views/controls/combobox/native_combobox_views_unittest.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 "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/native_combobox_views.h"
 #include "ui/views/ime/mock_input_method.h"
@@ skipping 32 matching lines @@
     key_received_ = key_handled_ = false;
   }
 
  private:
   bool key_handled_;
   bool key_received_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCombobox);
 };
 
-// A concrete class is needed to test the combo box.
+// A concrete class is needed to test the combobox.
 class TestComboboxModel : public ui::ComboboxModel {
  public:
   TestComboboxModel() {}
   virtual ~TestComboboxModel() {}
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE {
     return 4;
   }
   virtual string16 GetItemAt(int index) OVERRIDE {
@@ skipping 81 matching lines @@
   // Combobox does not take ownership of the model, hence it needs to be scoped.
   scoped_ptr<TestComboboxModel> model_;
 
   // For testing input method related behaviors.
   MockInputMethod* input_method_;
 };
 
 TEST_F(NativeComboboxViewsTest, KeyTest) {
   InitCombobox();
   SendKeyEvent(ui::VKEY_END);
-  EXPECT_EQ(combobox_->selected_item() + 1, model_->GetItemCount());
+  EXPECT_EQ(combobox_->selected_index() + 1, model_->GetItemCount());
   SendKeyEvent(ui::VKEY_HOME);
-  EXPECT_EQ(combobox_->selected_item(), 0);
+  EXPECT_EQ(combobox_->selected_index(), 0);
   SendKeyEvent(ui::VKEY_DOWN);
   SendKeyEvent(ui::VKEY_DOWN);
-  EXPECT_EQ(combobox_->selected_item(), 2);
+  EXPECT_EQ(combobox_->selected_index(), 2);
   SendKeyEvent(ui::VKEY_RIGHT);
-  EXPECT_EQ(combobox_->selected_item(), 2);
+  EXPECT_EQ(combobox_->selected_index(), 2);
   SendKeyEvent(ui::VKEY_LEFT);
-  EXPECT_EQ(combobox_->selected_item(), 2);
+  EXPECT_EQ(combobox_->selected_index(), 2);
 }
 
 // Check that if a combobox is disabled before it has a native wrapper, then the
 // native wrapper inherits the disabled state when it gets created.
 TEST_F(NativeComboboxViewsTest, DisabilityTest) {
   model_.reset(new TestComboboxModel());
 
   ASSERT_FALSE(combobox_);
   combobox_ = new TestCombobox(model_.get());
   combobox_->SetEnabled(false);
   ASSERT_FALSE(combobox_->GetNativeWrapperForTesting());
 
   widget_ = new Widget;
   Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(100, 100, 100, 100);
   widget_->Init(params);
   View* container = new View();
   widget_->SetContentsView(container);
   container->AddChildView(combobox_);
 
   combobox_view_ = static_cast<NativeComboboxViews*>(
       combobox_->GetNativeWrapperForTesting());
   ASSERT_TRUE(combobox_view_);
   ASSERT_FALSE(combobox_view_->enabled());
 }
 
 }  // namespace views