Added bowser test for Captive Portal Window.

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/helper.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 int kMargin = 50;
 
 }  // namespace
 
 namespace chromeos {
 
 CaptivePortalWindowProxy::CaptivePortalWindowProxy(Delegate* delegate,
                                                    gfx::NativeWindow parent)
     : delegate_(delegate),
       widget_(NULL),
       parent_(parent) {
 }
 
 CaptivePortalWindowProxy::~CaptivePortalWindowProxy() {
-  if (widget_) {
+  if (IsShown()) {
     widget_->RemoveObserver(this);
     widget_->Close();
   }
 }
 
 void CaptivePortalWindowProxy::ShowIfRedirected() {
-  if (widget_) {
+  if (IsShown()) {
     // Invalid state as when widget is created (Show())
     // CaptivePortalView ownership is transferred to it.
-    if (captive_portal_view_.get()) {
-      NOTREACHED();
-    }
+    DCHECK(!captive_portal_view_.get());
     // Dialog is already shown, no need to reload.
     return;
   }
-
-  // Dialog is not initialized yet.
-  if (!captive_portal_view_.get()) {
-    captive_portal_view_.reset(
-        new CaptivePortalView(ProfileHelper::GetSigninProfile(), this));
-  }
-
-  // If dialog has been created (but not shown) previously, force reload.
-  captive_portal_view_->StartLoad();
+  InitCaptivePortalView();
 }
 
 void CaptivePortalWindowProxy::Show() {
   if (ProxySettingsDialog::IsShown()) {
     // ProxySettingsDialog is being shown, don't cover it.
     Close();
     return;
   }
 
-  if (!captive_portal_view_.get() || widget_) {
-    // Dialog is already shown, do nothing.
+  if (IsShown())  // Dialog is already shown, do nothing.
     return;
-  }
+
+  InitCaptivePortalView();
 
   CaptivePortalView* captive_portal_view = captive_portal_view_.release();
   widget_ = views::Widget::CreateWindowWithParent(
       captive_portal_view,
       parent_);
   captive_portal_view->Init();
 
   gfx::Rect bounds(CalculateScreenBounds(gfx::Size()));
   bounds.Inset(kMargin, kMargin);
   widget_->SetBounds(bounds);
 
   widget_->AddObserver(this);
   widget_->Show();
 }
 
 void CaptivePortalWindowProxy::Close() {
-  if (widget_) {
+  if (IsShown())
     widget_->Close();
-  } else {
+  else
     captive_portal_view_.reset();
-  }
 }
 
 void CaptivePortalWindowProxy::OnRedirected() {
   Show();
   delegate_->OnPortalDetected();
 }
 
 void CaptivePortalWindowProxy::OnOriginalURLLoaded() {
   Close();
 }
 
-void CaptivePortalWindowProxy::OnWidgetDestroying(views::Widget* widget) {
+void CaptivePortalWindowProxy::OnWidgetClosing(views::Widget* widget) {
   DCHECK(widget == widget_);
   DCHECK(captive_portal_view_.get() == NULL);
   widget->RemoveObserver(this);
   widget_ = NULL;
 }
 
+void CaptivePortalWindowProxy::InitCaptivePortalView() {
+  if (!captive_portal_view_.get()) {
+    captive_portal_view_.reset(
+        new CaptivePortalView(ProfileHelper::GetSigninProfile(), this));
+  }
+  captive_portal_view_->StartLoad();
+}
+
+bool CaptivePortalWindowProxy::IsShown() const {
+  return widget_ != NULL;
+}
+
 }  // namespace chromeos