Fix even more crashes. To help identify remaining crashes now and in the future, I have made the ...

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
@@ skipping 123 matching lines @@
 int TestTableModel::CompareValues(int row1, int row2, int column_id) {
   return rows_[row1][column_id] - rows_[row2][column_id];
 }
 
 #if defined(OS_WIN)
 
 // TableViewTest ---------------------------------------------------------------
 
 class TableViewTest : public testing::Test, views::WidgetDelegate {
  public:
-  virtual void SetUp();
-  virtual void TearDown();
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
 
-  virtual views::View* GetContentsView() {
+  virtual views::View* GetContentsView() OVERRIDE {
     return table_;
   }
+  virtual views::Widget* GetWidget() OVERRIDE {
+    return table_->GetWidget();
+  }
+  virtual const views::Widget* GetWidget() const OVERRIDE {
+    return table_->GetWidget();
+  }
 
  protected:
   // Creates the model.
   virtual TestTableModel* CreateModel();
 
   // Verifies the view order matches that of the supplied arguments. The
   // arguments are in terms of the model. For example, values of '1, 0' indicate
   // the model index at row 0 is 1 and the model index at row 1 is 0.
   void VerifyViewOrder(int first, ...);
 
@@ skipping 304 matching lines @@
 #endif  // OS_WIN
 
 ////////////////////////////////////////////////////////////////////////////////
 // TableView2 Tests
 
 class TableView2Test : public testing::Test, views::WidgetDelegate {
  public:
   virtual void SetUp();
   virtual void TearDown();
 
-  virtual views::View* GetContentsView() {
+  virtual views::View* GetContentsView() OVERRIDE {
     return table_;
   }
+  virtual views::Widget* GetWidget() OVERRIDE {
+    return table_->GetWidget();
+  }
+  virtual const views::Widget* GetWidget() const OVERRIDE {
+    return table_->GetWidget();
+  }
 
   // Returns the contents of a cell in the table.
   std::wstring GetCellValue(int row, int column);
 
  protected:
   // Creates the model.
   TestTableModel* CreateModel();
 
   virtual views::TableTypes GetTableType() {
     return views::TEXT_ONLY;
@@ skipping 140 matching lines @@
 
   table_->FocusRow(2);
   EXPECT_EQ(2, table_->GetFirstFocusedRow());
 
   table_->ClearRowFocus();
   EXPECT_EQ(-1, table_->GetFirstSelectedRow());
 }
 #endif
 
 }  // namespace views