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

views/desktop/desktop_window.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 "views/desktop/desktop_window.h"
 
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/transform.h"
 #include "views/desktop/desktop_background.h"
 #include "views/desktop/desktop_window_root_view.h"
@@ skipping 21 matching lines @@
   // Overridden from Widget:
   virtual internal::RootView* CreateRootView() OVERRIDE {
     return new DesktopWindowRootView(desktop_window_, this);
   }
 
   DesktopWindow* desktop_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopWindowWindow);
 };
 
-class TestWindowContentView : public View,
-                              public WidgetDelegate {
+class TestWindowContentView : public WidgetDelegateView {
  public:
   TestWindowContentView(const std::wstring& title, SkColor color)
       : title_(title),
         color_(color) {
   }
   virtual ~TestWindowContentView() {}
 
  private:
   // Overridden from View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
@@ skipping 120 matching lines @@
   if (rotate) {
     ui::Transform transform;
     transform.SetRotate(90.0f);
     transform.SetTranslateX(window->GetWindowScreenBounds().width());
     nwv->GetView()->SetTransform(transform);
   }
 }
 
 }  // namespace desktop
 }  // namespace views