Reverts debugging code added for 91396. I've tracked down the bug and

views/widget/widget.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <stack>
 
@@ skipping 83 matching lines @@
   // Observers can listen to various events on the Widgets.
   class Observer {
    public:
     virtual void OnWidgetClosing(Widget* widget) {}
     virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible) {}
     virtual void OnWidgetActivationChanged(Widget* widget, bool active) {}
   };
 
   typedef std::set<Widget*> Widgets;
 
-  enum DestroyState {
-    // The default, everything is good and alive.
-    DESTROY_STATE_NONE = 1,
-
-    // Set once OnNativeWidgetDestroying has been invoked.
-    DESTROY_STATE_IN_DESTROYING,
-
-    // Set once OnNativeWidgetDestroyed has been invoked.
-    DESTROY_STATE_DESTROYED,
-
-    // Set once the destructor is invoked.
-    DESTROY_STATE_DELETED,
-  };
-
   enum FrameType {
     FRAME_TYPE_DEFAULT,         // Use whatever the default would be.
     FRAME_TYPE_FORCE_CUSTOM,    // Force the custom frame.
     FRAME_TYPE_FORCE_NATIVE     // Force the native frame.
   };
 
   struct VIEWS_EXPORT InitParams {
     enum Type {
       TYPE_WINDOW,      // A decorated Window, like a frame window.
                         // Widgets of TYPE_WINDOW will have a NonClientView.
@@ skipping 443 matching lines @@
   // are added to.  The default implementation returns the contents view
   // if it exists and the root view otherwise.
   virtual View* GetChildViewParent();
 
   // True if the widget is considered top level widget. Top level widget
   // is a widget of TYPE_WINDOW, TYPE_WINDOW_FRAMELESS, POPUP or MENU, and
   // has a focus manager and input method object associated with it.
   // TYPE_CONTROL and TYPE_TOOLTIP is not considered top level.
   bool is_top_level() const { return is_top_level_; }
 
-  DestroyState destroy_state() const { return destroy_state_; }
-
   // Overridden from NativeWidgetDelegate:
   virtual bool IsModal() const OVERRIDE;
   virtual bool IsDialogBox() const OVERRIDE;
   virtual bool CanActivate() const OVERRIDE;
   virtual bool IsInactiveRenderingDisabled() const OVERRIDE;
   virtual void EnableInactiveRendering() OVERRIDE;
   virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE;
   virtual void OnNativeFocus(gfx::NativeView focused_view) OVERRIDE;
   virtual void OnNativeBlur(gfx::NativeView focused_view) OVERRIDE;
   virtual void OnNativeWidgetVisibilityChanged(bool visible) OVERRIDE;
@@ skipping 143 matching lines @@
   bool focus_on_creation_;
 
   scoped_ptr<InputMethod> input_method_;
 
   // See |is_top_leve()| accessor.
   bool is_top_level_;
 
   // Factory used to create Compositors. Settable by tests.
   static ui::Compositor*(*compositor_factory_)();
 
-  // Tracks destroy state.
-  // TODO(sky): remove this, used in tracking 91396.
-  DestroyState destroy_state_;
-
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_