Index: chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc |
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc |
index daba966fdab2016e621979b1218cba1dea264df1..9af299730c6db8816349af07a78cf696598b408b 100644 |
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc |
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc |
@@ -334,7 +334,7 @@ TEST_F(NetworkPortalDetectorImplTest, Portal) { |
CompleteURLFetch(net::OK, 200, NULL); |
- ASSERT_FALSE(is_state_idle()); |
+ ASSERT_TRUE(is_state_idle()); |
CheckPortalState( |
NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1); |
@@ -425,7 +425,7 @@ TEST_F(NetworkPortalDetectorImplTest, TwoNetworks) { |
// WiFi is in portal state. |
CompleteURLFetch(net::OK, 200, NULL); |
- ASSERT_FALSE(is_state_idle()); |
+ ASSERT_TRUE(is_state_idle()); |
SetConnected(kStubEthernet); |
ASSERT_TRUE(is_state_checking_for_portal()); |
@@ -508,7 +508,7 @@ TEST_F(NetworkPortalDetectorImplTest, NetworkStateChanged) { |
CompleteURLFetch(net::OK, 200, NULL); |
- ASSERT_FALSE(is_state_idle()); |
+ ASSERT_TRUE(is_state_idle()); |
CheckPortalState( |
NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1); |
@@ -526,7 +526,7 @@ TEST_F(NetworkPortalDetectorImplTest, NetworkStateChanged) { |
CompleteURLFetch(net::OK, 200, NULL); |
- ASSERT_FALSE(is_state_idle()); |
+ ASSERT_TRUE(is_state_idle()); |
CheckPortalState( |
NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1); |
@@ -825,7 +825,7 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForPortalNetwork) { |
CompleteURLFetch(net::OK, 200, NULL); |
ASSERT_EQ(0, no_response_result_count()); |
- ASSERT_TRUE(is_state_portal_detection_pending()); |
+ ASSERT_TRUE(is_state_idle()); |
CheckPortalState( |
NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1); |
@@ -834,6 +834,7 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForPortalNetwork) { |
disable_error_screen_strategy(); |
+ // Set a different strategy will Start detection if idle. |
ASSERT_TRUE(is_state_portal_detection_pending()); |
CheckPortalState( |
NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1); |
@@ -887,7 +888,7 @@ TEST_F(NetworkPortalDetectorImplTest, TestDetectionRestart) { |
CheckPortalState( |
NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1); |
- ASSERT_FALSE(is_state_idle()); |
+ ASSERT_TRUE(is_state_idle()); |
ASSERT_TRUE( |
MakeResultHistogramChecker() |