views: Fix a couple of other trivial TODOs.

views/controls/table/table_view_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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
+
 #include "build/build_config.h"
+
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
 
 #include <vector>  // NOLINT
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/models/table_model_observer.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/table_view2.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
 
-using ui::TableModel;
-using ui::TableModelObserver;  // TODO(beng): remove these
-
 // Put the tests in the views namespace to make it easier to declare them as
 // friend classes.
 namespace views {
 
 // TestTableModel --------------------------------------------------------------
 
 // Trivial TableModel implementation that is backed by a vector of vectors.
 // Provides methods for adding/removing/changing the contents that notify the
 // observer appropriately.
 //
 // Initial contents are:
 // 0, 1
 // 1, 1
 // 2, 2
-class TestTableModel : public TableModel {
+class TestTableModel : public ui::TableModel {
  public:
   TestTableModel();
 
   // Adds a new row at index |row| with values |c1_value| and |c2_value|.
   void AddRow(int row, int c1_value, int c2_value);
 
   // Removes the row at index |row|.
   void RemoveRow(int row);
 
   // Changes the values of the row at |row|.
   void ChangeRow(int row, int c1_value, int c2_value);
 
-  // TableModel
+  // ui::TableModel:
   virtual int RowCount() OVERRIDE;
   virtual string16 GetText(int row, int column_id) OVERRIDE;
-  virtual void SetObserver(TableModelObserver* observer) OVERRIDE;
+  virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
   virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE;
 
  private:
-  TableModelObserver* observer_;
+  ui::TableModelObserver* observer_;
 
   // The data.
   std::vector<std::vector<int> > rows_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTableModel);
 };
 
 // Same behavior as TestTableModel, except even items are in one group, while
 // odd items are put in a different group.
 class GroupTestTableModel : public TestTableModel {
@@ skipping 46 matching lines @@
 }
 
 int TestTableModel::RowCount() {
   return static_cast<int>(rows_.size());
 }
 
 string16 TestTableModel::GetText(int row, int column_id) {
   return UTF8ToUTF16(base::IntToString(rows_[row][column_id]));
 }
 
-void TestTableModel::SetObserver(TableModelObserver* observer) {
+void TestTableModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
 
 int TestTableModel::CompareValues(int row1, int row2, int column_id) {
   return rows_[row1][column_id] - rows_[row2][column_id];
 }
 
 #if defined(OS_WIN)
 
 // TableViewTest ---------------------------------------------------------------
@@ skipping 38 matching lines @@
   TableView* table_;
 
  private:
   MessageLoopForUI message_loop_;
   views::Widget* window_;
 };
 
 void TableViewTest::SetUp() {
   OleInitialize(NULL);
   model_.reset(CreateModel());
-  std::vector<TableColumn> columns;
+  std::vector<ui::TableColumn> columns;
   columns.resize(2);
   columns[0].id = 0;
   columns[1].id = 1;
   table_ = new TableView(model_.get(), columns, views::ICON_AND_TEXT,
                          false, false, false);
   window_ = views::Widget::CreateWindowWithBounds(
       this,
       gfx::Rect(100, 100, 512, 512));
 }
 
@@ skipping 306 matching lines @@
  private:
   MessageLoopForUI message_loop_;
   views::Widget* window_;
 };
 
 void TableView2Test::SetUp() {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
   model_.reset(CreateModel());
-  std::vector<TableColumn> columns;
+  std::vector<ui::TableColumn> columns;
   columns.resize(2);
   columns[0].id = 0;
   columns[1].id = 1;
   table_ = new views::TableView2(model_.get(), columns, GetTableType(),
                                  views::TableView2::NONE);
   window_ = views::Widget::CreateWindowWithBounds(
       this,
       gfx::Rect(100, 100, 512, 512));
   window_->Show();
 }
@@ skipping 112 matching lines @@
 
   table_->FocusRow(2);
   EXPECT_EQ(2, table_->GetFirstFocusedRow());
 
   table_->ClearRowFocus();
   EXPECT_EQ(-1, table_->GetFirstSelectedRow());
 }
 #endif
 
 }  // namespace views