Fix crashes in EnterpriseEnrollmentScreenTest.TestCancel. This is independent of any tfarina-indu...

views/widget/native_widget_gtk.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/widget/native_widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 375 matching lines @@
   static bool installed_message_loop_observer = false;
   if (!installed_message_loop_observer) {
     installed_message_loop_observer = true;
     MessageLoopForUI* loop = MessageLoopForUI::current();
     if (loop)
       loop->AddObserver(DropObserver::GetInstance());
   }
 }
 
 NativeWidgetGtk::~NativeWidgetGtk() {
-  DCHECK(widget_ == NULL);
   // We need to delete the input method before calling DestroyRootView(),
   // because it'll set focus_manager_ to NULL.
   input_method_.reset();
-  if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
+  if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) {
+    DCHECK(widget_ == NULL);
     delete delegate_;
+  } else {
+    CloseNow();
+  }
 }
 
 GtkWindow* NativeWidgetGtk::GetTransientParent() const {
   return (!child_ && widget_) ?
       gtk_window_get_transient_for(GTK_WINDOW(widget_)) : NULL;
 }
 
 bool NativeWidgetGtk::MakeTransparent() {
   // Transparency can only be enabled only if we haven't realized the widget.
   DCHECK(!widget_);
@@ skipping 1746 matching lines @@
     button_pressed = event->type == GDK_BUTTON_PRESS ||
         event->type == GDK_2BUTTON_PRESS ||
         event->type == GDK_3BUTTON_PRESS;
     gdk_event_free(event);
   }
   return button_pressed;
 }
 
 }  // namespace internal
 }  // namespace views