Move TableModel out of views/ and into app/....

views/controls/table/table_view_unittest.cc

 // Copyright (c) 2006-2008 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 <vector>
 
+#include "app/table_model.h"
+#include "app/table_model_observer.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "views/controls/table/table_model.h"
 #include "views/controls/table/table_view.h"
 #include "views/window/window_delegate.h"
 #include "views/window/window_win.h"
 
 using views::TableView;
 
 // 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 views::TableModel {
+class TestTableModel : public 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
   virtual int RowCount();
   virtual std::wstring GetText(int row, int column_id);
-  virtual void SetObserver(views::TableModelObserver* observer);
+  virtual void SetObserver(TableModelObserver* observer);
   virtual int CompareValues(int row1, int row2, int column_id);
 
  private:
-  views::TableModelObserver* observer_;
+  TableModelObserver* observer_;
 
   // The data.
   std::vector<std::vector<int>> rows_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTableModel);
 };
 
 TestTableModel::TestTableModel() : observer_(NULL) {
   AddRow(0, 0, 1);
   AddRow(1, 1, 1);
@@ skipping 25 matching lines @@
 }
 
 int TestTableModel::RowCount() {
   return static_cast<int>(rows_.size());
 }
 
 std::wstring TestTableModel::GetText(int row, int column_id) {
   return IntToWString(rows_[row][column_id]);
 }
 
-void TestTableModel::SetObserver(views::TableModelObserver* observer) {
+void TestTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
 int TestTableModel::CompareValues(int row1, int row2, int column_id) {
   return rows_[row1][column_id] - rows_[row2][column_id];
 }
 
 // TableViewTest ---------------------------------------------------------------
 
 class TableViewTest : public testing::Test, views::WindowDelegate {
@@ skipping 30 matching lines @@
   TableView* table_;
 
  private:
   MessageLoopForUI message_loop_;
   views::Window* window_;
 };
 
 void TableViewTest::SetUp() {
   OleInitialize(NULL);
   model_.reset(CreateModel());
-  std::vector<views::TableColumn> columns;
+  std::vector<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::Window::CreateChromeWindow(NULL,
                                               gfx::Rect(100, 100, 512, 512),
                                               this);
 }
@@ skipping 218 matching lines @@
 
   model_->AddRow(3, 4, 4);
 
   VerifySelectedRows(1, 0, -1);
 }
 
 TEST_F(NullModelTableViewTest, NullModel) {
   // There's nothing explicit to test. If there is a bug in TableView relating
   // to a NULL model we'll crash.
 }