Added browser test for Captive Portal window ctor and dtor.

chrome/browser/chromeos/login/captive_portal_window_proxy.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
 
 #include "chrome/browser/chromeos/login/captive_portal_view.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
@@ skipping 72 matching lines @@
 }
 
 void CaptivePortalWindowProxy::OnOriginalURLLoaded() {
   Close();
 }
 
 void CaptivePortalWindowProxy::OnWidgetClosing(views::Widget* widget) {
   DCHECK(GetState() == STATE_DISPLAYED);
   DCHECK(widget == widget_);
 
-  widget->RemoveObserver(this);
-  widget_ = NULL;
+  DetachFromWidget(widget);
 
   DCHECK(GetState() == STATE_IDLE);
 }
 
+void CaptivePortalWindowProxy::OnWidgetDestroying(views::Widget* widget) {
+  DetachFromWidget(widget);
+}
+
+void CaptivePortalWindowProxy::OnWidgetDestroyed(views::Widget* widget) {
+  DetachFromWidget(widget);
+}
+
 void CaptivePortalWindowProxy::InitCaptivePortalView() {
   DCHECK(GetState() == STATE_IDLE ||
          GetState() == STATE_WAITING_FOR_REDIRECTION);
   if (!captive_portal_view_.get()) {
     captive_portal_view_.reset(
         new CaptivePortalView(ProfileHelper::GetSigninProfile(), this));
   }
   captive_portal_view_->StartLoad();
 }
 
 CaptivePortalWindowProxy::State CaptivePortalWindowProxy::GetState() const {
   if (widget_ == NULL) {
     if (captive_portal_view_.get() == NULL)
       return STATE_IDLE;
     else
       return STATE_WAITING_FOR_REDIRECTION;
   } else {
     if (captive_portal_view_.get() == NULL)
       return STATE_DISPLAYED;
     else
       NOTREACHED();
   }
   return STATE_UNKNOWN;
 }
 
+void CaptivePortalWindowProxy::DetachFromWidget(views::Widget* widget) {
+  if (!widget_ || widget_ != widget)
+    return;
+  widget_->RemoveObserver(this);
+  widget_ = NULL;
+}
+
 }  // namespace chromeos