cros: no active portal check when successfully behind portal

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 480 matching lines @@
     response_code = 200;
   }
 
   DetectionAttemptCompletedReport attempt_completed_report(
       default_network_name_, default_network_id_, result, response_code);
   if (!attempt_completed_report_.Equals(attempt_completed_report)) {
     attempt_completed_report_ = attempt_completed_report;
     attempt_completed_report_.Report();
   }
 
-  state_ = STATE_IDLE;
+  // If we are successfully behind captive portal, mark the state so that it
+  // won't schedule detection actively by self.
+  if (result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL &&
+      response_code == 200) {
+    // This can happen when portal provider disconnects us, in which case shill
+    // remains online state.
+    if (network && network->connection_state() == shill::kStateOnline)
+      state_ = STATE_IDLE;
+    else
+      state_ = STATE_BEHIND_PORTAL_IDLE;

[stevenjb, 2017/06/07 23:00:23]

Combine the logic so that this is:

if (result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL &&
    response_code == 200 &&
    (!network || network->connection_state() != shill::kStateOnline) {
  state_ = STATE_BEHIND_PORTAL_IDLE;
} else {
  state_ = STATE_IDLE;
}

When we combine it like that I'm not 100% certain the logic is correct, or at
least, the comments are not entirely clear, so maybe try to clarify the logic a
little?

[Qiang(Joe) Xu, 2017/06/07 23:19:13]

Done.

+  } else {
+    state_ = STATE_IDLE;
+  }
   attempt_timeout_.Cancel();
 
   CaptivePortalState state;
   state.response_code = response_code;
   state.time = NowTicks();
   switch (result) {
     case captive_portal::RESULT_NO_RESPONSE:
       if (state.response_code == net::HTTP_PROXY_AUTHENTICATION_REQUIRED) {
         state.status = CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
       } else if (network && network->is_captive_portal()) {
@@ skipping 135 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