ChromeOS: Do not show the error dialog when captive portal is detected in OOBE.

chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc

 // Copyright 2014 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/ui/captive_portal_window_proxy.h"
 
+#include "base/metrics/histogram_macros.h"
 #include "chrome/browser/chromeos/login/ui/captive_portal_view.h"
 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/web_modal/popup_manager.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // The captive portal dialog is system-modal, but uses the web-content-modal
 // dialog manager (odd) and requires this atypical dialog widget initialization.
@@ skipping 66 matching lines @@
 }
 
 void CaptivePortalWindowProxy::Close() {
   if (GetState() == STATE_DISPLAYED)
     widget_->Close();
   captive_portal_view_.reset();
   captive_portal_view_for_testing_ = NULL;
 }
 
 void CaptivePortalWindowProxy::OnRedirected() {
-  if (GetState() == STATE_WAITING_FOR_REDIRECTION)
+  if (GetState() == STATE_WAITING_FOR_REDIRECTION) {
+    if (!started_loading_at_.is_null()) {
+      UMA_HISTOGRAM_TIMES("CaptivePortal.RedirectTime",
+                          base::Time::Now() - started_loading_at_);
+      started_loading_at_ = base::Time();
+    }
     Show();
+  }
   delegate_->OnPortalDetected();
 }
 
 void CaptivePortalWindowProxy::OnOriginalURLLoaded() {
   Close();
 }
 
 void CaptivePortalWindowProxy::OnWidgetClosing(views::Widget* widget) {
   DCHECK(GetState() == STATE_DISPLAYED);
   DCHECK(widget == widget_);
@@ skipping 12 matching lines @@
 }
 
 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_for_testing_ = captive_portal_view_.get();
   }
+
+  started_loading_at_ = base::Time::Now();
   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