views: Fix a couple of trivial TODOS.

views/controls/combobox/native_combobox_views_unittest.cc

 // Copyright (c) 2011 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 "views/controls/combobox/combobox.h"
 #include "views/controls/combobox/native_combobox_views.h"
 #include "views/ime/mock_input_method.h"
 #include "views/test/views_test_base.h"
 #include "views/widget/native_widget_private.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 // A wrapper of Combobox to intercept the result of OnKeyPressed() and
 // OnKeyReleased() methods.
 class TestCombobox : public views::Combobox {
  public:
-  TestCombobox(ComboboxModel* model)
+  TestCombobox(ui::ComboboxModel* model)
       : Combobox(model),
         key_handled_(false),
         key_received_(false) {
   }
 
   virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE {
     key_received_ = true;
     key_handled_ = views::Combobox::OnKeyPressed(e);
     return key_handled_;
   }
@@ skipping 103 matching lines @@
   // We need widget to populate wrapper class.
   Widget* widget_;
 
   // combobox_ will be allocated InitCombobox() and then owned by widget_.
   TestCombobox* combobox_;
 
   // combobox_view_ is the pointer to the pure Views interface of combobox_.
   NativeComboboxViews* combobox_view_;
 
   // Combobox does not take ownership of model_, which needs to be scoped.
-  scoped_ptr<ComboboxModel> model_;
+  scoped_ptr<ui::ComboboxModel> 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());
   SendKeyEvent(ui::VKEY_HOME);
   EXPECT_EQ(combobox_->selected_item(), 0);
   SendKeyEvent(ui::VKEY_DOWN);
   SendKeyEvent(ui::VKEY_DOWN);
   EXPECT_EQ(combobox_->selected_item(), 2);
   SendKeyEvent(ui::VKEY_RIGHT);
   EXPECT_EQ(combobox_->selected_item(), 2);
   SendKeyEvent(ui::VKEY_LEFT);
   EXPECT_EQ(combobox_->selected_item(), 2);
 }
 
 }  // namespace views