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

views/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.
 
 #include <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/clipboard/clipboard.h"
@@ skipping 1065 matching lines @@
 };
 
 class SimpleWidgetDelegate : public WidgetDelegate {
  public:
   explicit SimpleWidgetDelegate(View* contents) : contents_(contents) {  }
 
   virtual void DeleteDelegate() { delete this; }
 
   virtual View* GetContentsView() { return contents_; }
 
+  virtual Widget* GetWidget() { return contents_->GetWidget(); }
+  virtual const Widget* GetWidget() const { return contents_->GetWidget(); }
+
  private:
   View* contents_;
 };
 
 // Tests that the mouse-wheel messages are correctly rerouted to the window
 // under the mouse.
 // TODO(jcampan): http://crbug.com/10572 Disabled as it fails on the Vista build
 //                bot.
 // Note that this fails for a variety of reasons:
 // - focused view is apparently reset across window activations and never
@@ skipping 1009 matching lines @@
   ASSERT_EQ(0, child1->GetIndexOf(foo1));
 
   ASSERT_EQ(-1, child2->GetIndexOf(NULL));
   ASSERT_EQ(-1, child2->GetIndexOf(&root));
   ASSERT_EQ(-1, child2->GetIndexOf(child2));
   ASSERT_EQ(-1, child2->GetIndexOf(child1));
   ASSERT_EQ(-1, child2->GetIndexOf(foo1));
 }
 
 }  // namespace views