Fixed portal detector behaviour for proxied network.

chrome/browser/chromeos/net/network_portal_detector.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/net/network_portal_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 18 matching lines @@
 const int kMaxRequestAttempts = 3;
 
 // Minimum timeout between consecutive portal checks for the same
 // network.
 const int kMinTimeBetweenAttemptsSec = 3;
 
 // Timeout for a portal check.
 const int kRequestTimeoutSec = 10;
 
 // Delay before portal detection caused by changes in proxy settings.
-const int kProxyChangeDelayMs = 500;
+const int kProxyChangeDelayMs = 1000;
 
 std::string CaptivePortalStatusString(
     NetworkPortalDetector::CaptivePortalStatus status) {
   switch (status) {
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
       return l10n_util::GetStringUTF8(
           IDS_CHROMEOS_CAPTIVE_PORTAL_STATUS_UNKNOWN);
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
       return l10n_util::GetStringUTF8(
           IDS_CHROMEOS_CAPTIVE_PORTAL_STATUS_OFFLINE);
@@ skipping 254 matching lines @@
 
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   const Network* active_network = cros->active_network();
   if (!active_network)
     return;
 
   CaptivePortalState state;
   state.response_code = results.response_code;
   switch (results.result) {
     case captive_portal::RESULT_NO_RESPONSE:
-      if (state.response_code == net::HTTP_PROXY_AUTHENTICATION_REQUIRED) {
-        state.status = CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
-        SetCaptivePortalState(active_network, state);
-      } else if (attempt_count_ >= kMaxRequestAttempts) {
-        // Take into account shill's detection results.
-        if (active_network->restricted_pool()) {
+      if (attempt_count_ >= kMaxRequestAttempts) {
+        if (state.response_code == net::HTTP_PROXY_AUTHENTICATION_REQUIRED) {
+          state.status = CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
+        } else if (active_network->restricted_pool()) {
+          // Take into account shill's detection results.
           state.status = CAPTIVE_PORTAL_STATUS_PORTAL;
           LOG(WARNING) << "Network " << active_network->unique_id() << " "
                        << "is marked as "
                        << CaptivePortalStatusString(state.status) << " "
                        << "despite the fact that CaptivePortalDetector "
                        << "received no response";
         } else {
           state.status = CAPTIVE_PORTAL_STATUS_OFFLINE;
         }
         SetCaptivePortalState(active_network, state);
@@ skipping 67 matching lines @@
 }
 
 base::TimeTicks NetworkPortalDetector::GetCurrentTimeTicks() const {
   if (time_ticks_for_testing_.is_null())
     return base::TimeTicks::Now();
   else
     return time_ticks_for_testing_;
 }
 
 }  // namespace chromeos