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

views/focus/focus_manager_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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 98 matching lines @@
     OleInitialize(NULL);
 #endif
   }
 
   ~FocusManagerTest() {
 #if defined(OS_WIN)
     OleUninitialize();
 #endif
   }
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     window_ = Widget::CreateWindowWithBounds(this, bounds());
     InitContentView();
     window_->Show();
   }
 
-  virtual void TearDown() {
+  virtual void TearDown() OVERRIDE {
     if (focus_change_listener_)
       GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_);
     window_->Close();
 
     // Flush the message loop to make Purify happy.
     message_loop()->RunAllPending();
   }
 
   FocusManager* GetFocusManager() {
     return window_->GetFocusManager();
   }
 
   void FocusNativeView(gfx::NativeView native_view) {
 #if defined(OS_WIN)
   ::SendMessage(native_view, WM_SETFOCUS, NULL, NULL);
 #else
     gint return_val;
     GdkEventFocus event;
     event.type = GDK_FOCUS_CHANGE;
     event.window =
         gtk_widget_get_root_window(GTK_WIDGET(window_->GetNativeWindow()));
     event.send_event = TRUE;
     event.in = TRUE;
     gtk_signal_emit_by_name(GTK_OBJECT(native_view), "focus-in-event",
                             &event, &return_val);
 #endif
   }
 
   // WidgetDelegate Implementation.
-  virtual View* GetContentsView() {
+  virtual View* GetContentsView() OVERRIDE {
     if (!content_view_)
       content_view_ = new View();
     return content_view_;
   }
+  virtual Widget* GetWidget() OVERRIDE {
+    return content_view_->GetWidget();
+  }
+  virtual const Widget* GetWidget() const OVERRIDE {
+    return content_view_->GetWidget();
+  }
 
   virtual void InitContentView() {
   }
 
  protected:
   virtual gfx::Rect bounds() {
     return gfx::Rect(0, 0, 500, 500);
   }
 
   // Mocks activating/deactivating the window.
@@ skipping 1551 matching lines @@
   ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
 
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 }  // namespace views