More work to make ash_unittests pass when we require context.

ui/views/controls/table/table_view_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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 
 #include "build/build_config.h"
 
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #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 "ui/base/win/scoped_ole_initializer.h"
 #include "ui/views/controls/table/table_view.h"
+#include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 // 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.
@@ skipping 94 matching lines @@
 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];
 }
 
 // TableViewTest ---------------------------------------------------------------
 
-class TableViewTest : public testing::Test, views::WidgetDelegate {
+class TableViewTest : public ViewsTestBase, views::WidgetDelegate {
  public:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   virtual views::View* GetContentsView() OVERRIDE {
     return table_;
   }
   virtual views::Widget* GetWidget() OVERRIDE {
     return table_->GetWidget();
   }
@@ skipping 19 matching lines @@
   // This selects model rows 0 and 1, and if |sort| is true the first column
   // is sorted in descending order.
   void SetUpMultiSelectTestState(bool sort);
 
   scoped_ptr<TestTableModel> model_;
 
   // The table. This is owned by the window.
   TableView* table_;
 
  private:
-  MessageLoopForUI message_loop_;
   views::Widget* window_;
-  ui::ScopedOleInitializer ole_initializer_;
 };
 
 void TableViewTest::SetUp() {
+  ViewsTestBase::SetUp();
+
   model_.reset(CreateModel());
   std::vector<ui::TableColumn> columns;
   columns.resize(2);
   columns[0].id = 0;
   columns[1].id = 1;
+
+  // TODO(erg): This crashes on windows. Try making this derive from ViewsTests.
   table_ = new TableView(model_.get(), columns, views::ICON_AND_TEXT,
                          false, false, false);
-  window_ = views::Widget::CreateWindowWithBounds(
-      this,
-      gfx::Rect(100, 100, 512, 512));
+  window_ = views::Widget::CreateWindowWithContextAndBounds(
+      this, GetContext(), gfx::Rect(100, 100, 512, 512));
 }
 
 void TableViewTest::TearDown() {
   window_->Close();
-  // Temporary workaround to avoid leak of RootView::pending_paint_task_.
-  message_loop_.RunUntilIdle();
+
+  ViewsTestBase::TearDown();
 }
 
 void TableViewTest::VerifyViewOrder(int first, ...) {
   va_list marker;
   va_start(marker, first);
   int value = first;
   int index = 0;
   for (int value = first, index = 0; value != -1; index++) {
     ASSERT_EQ(value, table_->ViewToModel(index));
     value = va_arg(marker, int);
@@ skipping 246 matching lines @@
   VerifySelectedRows(2, 0, -1);
 }
 
 // Crashing: http://crbug.com/45015
 TEST_F(NullModelTableViewTest, DISABLED_NullModel) {
   // There's nothing explicit to test. If there is a bug in TableView relating
   // to a NULL model we'll crash.
 }
 
 }  // namespace views