cros: Do not schedule attempt when behind captive portal with response 200 is detected

chrome/browser/chromeos/net/network_portal_detector_impl.cc

 // Copyright (c) 2013 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/net/network_portal_detector_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 532 matching lines @@
   if (result == captive_portal::RESULT_NO_RESPONSE)
     ++no_response_result_count_;
   else
     no_response_result_count_ = 0;
 
   if (state.status != CAPTIVE_PORTAL_STATUS_OFFLINE ||
       same_detection_result_count_ >= kMaxOfflineResultsBeforeReport) {
     OnDetectionCompleted(network, state);
   }
 
-  // Observers (via OnDetectionCompleted) may already schedule new attempt.
-  if (is_idle())
+  // Do not schedule attempt if Observers (via OnDetectionCompleted) already
+  // schedule new attempt or we are already behind captive portal, which can be

[stevenjb, 2017/03/17 00:26:46]

nit: 'has already scheduled a new attempt', 'behind a captive portal'

+  // either the result of NetworkPortalDetector or shill's detection.
+  if (is_idle() && state.status != CAPTIVE_PORTAL_STATUS_PORTAL)
     ScheduleAttempt(results.retry_after_delta);
 }
 
 void NetworkPortalDetectorImpl::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_LOGIN_PROXY_CHANGED ||
       type == chrome::NOTIFICATION_AUTH_SUPPLIED ||
       type == chrome::NOTIFICATION_AUTH_CANCELLED) {
@@ skipping 80 matching lines @@
 }
 
 void NetworkPortalDetectorImpl::ResetStrategyAndCounters() {
   last_detection_result_ = CAPTIVE_PORTAL_STATUS_UNKNOWN;
   same_detection_result_count_ = 0;
   no_response_result_count_ = 0;
   strategy_->Reset();
 }
 
 }  // namespace chromeos