Implemented lazy portal detection.

chrome/browser/chromeos/net/network_portal_detector_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 62 matching lines @@
   Profile* profile() { return profile_.get(); }
 
   NetworkPortalDetector* network_portal_detector() {
     return network_portal_detector_.get();
   }
 
   NetworkPortalDetector::State state() {
     return network_portal_detector()->state();
   }
 
+  void enable_lazy_detection() {
+    network_portal_detector()->EnableLazyDetection();
+  }
+
+  void disable_lazy_detection() {
+    network_portal_detector()->DisableLazyDetection();
+  }
+
   bool is_state_idle() {
     return (NetworkPortalDetector::STATE_IDLE == state());
   }
 
   bool is_state_portal_detection_pending() {
     return (NetworkPortalDetector::STATE_PORTAL_CHECK_PENDING == state());
   }
 
   bool is_state_checking_for_portal() {
     return (NetworkPortalDetector::STATE_CHECKING_FOR_PORTAL == state());
   }
 
   void set_request_timeout(const base::TimeDelta& timeout) {
     network_portal_detector()->set_request_timeout_for_testing(timeout);
   }
 
   const base::TimeDelta& next_attempt_delay() {
     return network_portal_detector()->next_attempt_delay_for_testing();
   }
 
   int attempt_count() {
     return network_portal_detector()->attempt_count_for_testing();
   }
 
   void set_min_time_between_attempts(const base::TimeDelta& delta) {
     network_portal_detector()->set_min_time_between_attempts_for_testing(delta);
   }
 
+  void set_lazy_check_interval(const base::TimeDelta& delta) {
+    network_portal_detector()->set_lazy_check_interval_for_testing(delta);
+  }
+
   void set_time_ticks(const base::TimeTicks& time_ticks) {
     network_portal_detector()->set_time_ticks_for_testing(time_ticks);
   }
 
   void SetBehindPortal(Network* network) {
     Network::TestApi test_api(network);
         test_api.SetBehindPortal();
     static_cast<NetworkLibraryImplBase*>(
         network_library())->CallConnectToNetwork(network);
     MessageLoop::current()->RunUntilIdle();
@@ skipping 330 matching lines @@
                    net::URLFetcher::RESPONSE_CODE_INVALID,
                    NULL);
   ASSERT_EQ(3, attempt_count());
   ASSERT_TRUE(is_state_idle());
 
   CheckPortalState(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL,
                    net::URLFetcher::RESPONSE_CODE_INVALID,
                    wifi1_network());
 }
 
+TEST_F(NetworkPortalDetectorTest, LazyDetectionForOnlineNetwork) {
+  ASSERT_TRUE(is_state_idle());
+  set_min_time_between_attempts(base::TimeDelta());
+  set_lazy_check_interval(base::TimeDelta());
+
+  SetConnected(wifi1_network());
+  enable_lazy_detection();
+  CompleteURLFetch(net::OK, 204, NULL);
+
+  ASSERT_EQ(3, attempt_count());
+  ASSERT_TRUE(is_state_portal_detection_pending());
+  CheckPortalState(
+      NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204,
+      wifi1_network());
+
+  // To run CaptivePortalDetector::DetectCaptivePortal().
+  MessageLoop::current()->RunUntilIdle();
+
+  CompleteURLFetch(net::OK, 204, NULL);
+
+  ASSERT_EQ(3, attempt_count());
+  ASSERT_TRUE(is_state_portal_detection_pending());
+  CheckPortalState(
+      NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204,
+      wifi1_network());
+
+  // To run CaptivePortalDetector::DetectCaptivePortal().
+  MessageLoop::current()->RunUntilIdle();
+
+  disable_lazy_detection();
+  ASSERT_TRUE(is_state_idle());
+}
+
+TEST_F(NetworkPortalDetectorTest, LazyDetectionForPortalNetwork) {
+  ASSERT_TRUE(is_state_idle());
+  set_min_time_between_attempts(base::TimeDelta());
+  set_lazy_check_interval(base::TimeDelta());
+
+  SetConnected(wifi1_network());
+  enable_lazy_detection();
+
+  CompleteURLFetch(net::ERR_CONNECTION_CLOSED,
+                   net::URLFetcher::RESPONSE_CODE_INVALID,
+                   NULL);
+  ASSERT_EQ(1, attempt_count());
+  ASSERT_TRUE(is_state_portal_detection_pending());
+  CheckPortalState(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1,
+                   wifi1_network());
+
+  // To run CaptivePortalDetector::DetectCaptivePortal().
+  MessageLoop::current()->RunUntilIdle();
+
+  CompleteURLFetch(net::ERR_CONNECTION_CLOSED,
+                   net::URLFetcher::RESPONSE_CODE_INVALID,
+                   NULL);
+  ASSERT_EQ(2, attempt_count());
+  ASSERT_TRUE(is_state_portal_detection_pending());
+  CheckPortalState(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1,
+                   wifi1_network());
+
+  // To run CaptivePortalDetector::DetectCaptivePortal().
+  MessageLoop::current()->RunUntilIdle();
+
+  CompleteURLFetch(net::OK, 200, NULL);
+  ASSERT_EQ(3, attempt_count());
+  ASSERT_TRUE(is_state_portal_detection_pending());
+  CheckPortalState(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200,
+                   wifi1_network());
+
+  // To run CaptivePortalDetector::DetectCaptivePortal().
+  MessageLoop::current()->RunUntilIdle();
+  CompleteURLFetch(net::OK, 200, NULL);
+  ASSERT_EQ(3, attempt_count());
+  ASSERT_TRUE(is_state_portal_detection_pending());
+  CheckPortalState(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200,
+                   wifi1_network());
+
+  disable_lazy_detection();
+  ASSERT_TRUE(is_state_idle());
+}
+
 }  // namespace chromeos