Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4043)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc

Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move CaptivePortalDetector to a component Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/captive_portal/captive_portal_service.cc ('K') | « chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc ('k') | chrome/browser/chromeos/net/network_portal_notification_controller.cc » ('j') | components/captive_portal/captive_portal_detector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 18bd965c30cda1ae4e4fbe4b6e893042fc50279d..d58ec6419f47d8b23ae8cc238f7bcd6d0eadbd51 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
@@ -13,8 +13,6 @@
#include "base/metrics/histogram_samples.h"
#include "base/metrics/statistics_recorder.h"
#include "base/run_loop.h"
-#include "chrome/browser/captive_portal/captive_portal_detector.h"
-#include "chrome/browser/captive_portal/testing_utils.h"
#include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
#include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"
#include "chrome/test/base/testing_profile.h"
@@ -25,6 +23,8 @@
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
#include "chromeos/network/shill_property_util.h"
+#include "components/captive_portal/captive_portal_detector.h"
+#include "components/captive_portal/captive_portal_testing_utils.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "dbus/object_path.h"
#include "net/base/net_errors.h"
@@ -99,7 +99,7 @@ class NetworkPortalDetectorImplTest
PortalDetectorStrategy::reset_fields_for_testing();
}
- void CheckPortalState(NetworkPortalDetector::CaptivePortalStatus status,
+ void CheckPortalState(captive_portal::CaptivePortalStatus status,
int response_code,
const std::string& service_path) {
NetworkPortalDetector::CaptivePortalState state =
@@ -225,7 +225,7 @@ class NetworkPortalDetectorImplTest
return scoped_ptr<EnumHistogramChecker>(
new EnumHistogramChecker(
"CaptivePortal.OOBE.DetectionResult",
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT,
+ captive_portal::CAPTIVE_PORTAL_STATUS_COUNT,
original_samples_.get()));
}
@@ -281,16 +281,16 @@ TEST_F(NetworkPortalDetectorImplTest, NoPortal) {
ASSERT_TRUE(is_state_checking_for_portal());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
CompleteURLFetch(net::OK, 204, NULL);
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
->Check());
}
@@ -305,7 +305,7 @@ TEST_F(NetworkPortalDetectorImplTest, Portal) {
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
// Check HTTP 301 response code.
SetConnected(kStubWireless2);
@@ -315,7 +315,7 @@ TEST_F(NetworkPortalDetectorImplTest, Portal) {
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 301, kStubWireless2);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 301, kStubWireless2);
// Check HTTP 302 response code.
SetConnected(kStubEthernet);
@@ -325,11 +325,11 @@ TEST_F(NetworkPortalDetectorImplTest, Portal) {
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 302, kStubEthernet);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 302, kStubEthernet);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 3)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 3)
->Check());
}
@@ -340,7 +340,7 @@ TEST_F(NetworkPortalDetectorImplTest, Online2Offline) {
network_portal_detector()->AddObserver(&observer);
NetworkPortalDetector::CaptivePortalState offline_state;
- offline_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE;
+ offline_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE;
// WiFi is in online state.
{
@@ -352,7 +352,7 @@ TEST_F(NetworkPortalDetectorImplTest, Online2Offline) {
// Expect a single transition to an online state.
NetworkPortalDetector::CaptivePortalState online_state;
- online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
+ online_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;
online_state.response_code = 204;
EXPECT_CALL(observer, OnPortalDetectionCompleted(_, online_state)).Times(1);
@@ -382,7 +382,7 @@ TEST_F(NetworkPortalDetectorImplTest, Online2Offline) {
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
->Check());
}
@@ -403,14 +403,14 @@ TEST_F(NetworkPortalDetectorImplTest, TwoNetworks) {
CompleteURLFetch(net::OK, 204, NULL);
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubEthernet);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubEthernet);
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 1)
->Check());
}
@@ -434,16 +434,16 @@ TEST_F(NetworkPortalDetectorImplTest, NetworkChanged) {
CompleteURLFetch(net::OK, 204, NULL);
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubEthernet);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubEthernet);
// As active network was changed during portal detection for wifi
// network, it's state must be unknown.
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
->Check());
}
@@ -457,14 +457,14 @@ TEST_F(NetworkPortalDetectorImplTest, NetworkStateNotChanged) {
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
SetConnected(kStubWireless1);
ASSERT_TRUE(is_state_idle());
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
->Check());
}
@@ -479,7 +479,7 @@ TEST_F(NetworkPortalDetectorImplTest, NetworkStateChanged) {
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
SetConnected(kStubWireless1);
ASSERT_TRUE(is_state_checking_for_portal());
@@ -488,7 +488,7 @@ TEST_F(NetworkPortalDetectorImplTest, NetworkStateChanged) {
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
SetBehindPortal(kStubWireless1);
ASSERT_TRUE(is_state_checking_for_portal());
@@ -497,12 +497,12 @@ TEST_F(NetworkPortalDetectorImplTest, NetworkStateChanged) {
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 2)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 2)
->Check());
}
@@ -592,11 +592,11 @@ TEST_F(NetworkPortalDetectorImplTest, FirstAttemptFailed) {
ASSERT_TRUE(is_state_idle());
ASSERT_EQ(2, attempt_count());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
->Check());
}
@@ -630,13 +630,13 @@ TEST_F(NetworkPortalDetectorImplTest, AllAttemptsFailed) {
CompleteURLFetch(net::OK, 503, retry_after);
ASSERT_TRUE(is_state_idle());
ASSERT_EQ(3, attempt_count());
- CheckPortalState(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE,
+ CheckPortalState(captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE,
503,
kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE, 1)
->Check());
}
@@ -649,12 +649,12 @@ TEST_F(NetworkPortalDetectorImplTest, ProxyAuthRequired) {
ASSERT_EQ(1, attempt_count());
ASSERT_TRUE(is_state_idle());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED,
+ captive_portal::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED,
407,
kStubWireless1);
ASSERT_TRUE(MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::
+ ->Expect(captive_portal::
CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED,
1)
->Check());
@@ -688,13 +688,13 @@ TEST_F(NetworkPortalDetectorImplTest, NoResponseButBehindPortal) {
ASSERT_EQ(3, attempt_count());
ASSERT_TRUE(is_state_idle());
- CheckPortalState(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL,
+ CheckPortalState(captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL,
net::URLFetcher::RESPONSE_CODE_INVALID,
kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 1)
->Check());
}
@@ -724,7 +724,7 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForOnlineNetwork) {
ASSERT_TRUE(is_state_portal_detection_pending());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
// To run CaptivePortalDetector::DetectCaptivePortal().
base::RunLoop().RunUntilIdle();
@@ -733,7 +733,7 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForOnlineNetwork) {
ASSERT_TRUE(is_state_portal_detection_pending());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
// To run CaptivePortalDetector::DetectCaptivePortal().
base::RunLoop().RunUntilIdle();
@@ -747,11 +747,11 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForOnlineNetwork) {
CompleteURLFetch(net::OK, 204, NULL);
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
->Check());
}
@@ -767,7 +767,7 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForPortalNetwork) {
ASSERT_EQ(1, attempt_count());
ASSERT_TRUE(is_state_portal_detection_pending());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
// To run CaptivePortalDetector::DetectCaptivePortal().
base::RunLoop().RunUntilIdle();
@@ -777,7 +777,7 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForPortalNetwork) {
ASSERT_EQ(2, attempt_count());
ASSERT_TRUE(is_state_portal_detection_pending());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
// To run CaptivePortalDetector::DetectCaptivePortal().
base::RunLoop().RunUntilIdle();
@@ -786,7 +786,7 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForPortalNetwork) {
ASSERT_EQ(3, attempt_count());
ASSERT_TRUE(is_state_portal_detection_pending());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
// To run CaptivePortalDetector::DetectCaptivePortal().
base::RunLoop().RunUntilIdle();
@@ -795,11 +795,11 @@ TEST_F(NetworkPortalDetectorImplTest, ErrorScreenStrategyForPortalNetwork) {
ASSERT_TRUE(is_state_portal_detection_pending());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 1)
->Check());
}
@@ -810,14 +810,14 @@ TEST_F(NetworkPortalDetectorImplTest, DetectionTimeoutIsCancelled) {
SetConnected(kStubWireless1);
ASSERT_TRUE(is_state_checking_for_portal());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
stop_detection();
ASSERT_TRUE(is_state_idle());
ASSERT_TRUE(attempt_timeout_is_cancelled());
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN, -1, kStubWireless1);
ASSERT_TRUE(MakeResultHistogramChecker()->Check());
}
@@ -834,7 +834,7 @@ TEST_F(NetworkPortalDetectorImplTest, TestDetectionRestart) {
CompleteURLFetch(net::OK, 204, NULL);
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 204, kStubWireless1);
ASSERT_TRUE(is_state_idle());
// First portal detection attempts determines PORTAL state.
@@ -847,13 +847,13 @@ TEST_F(NetworkPortalDetectorImplTest, TestDetectionRestart) {
CompleteURLFetch(net::OK, 200, NULL);
CheckPortalState(
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
+ captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 200, kStubWireless1);
ASSERT_TRUE(is_state_idle());
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL, 1)
->Check());
}
@@ -921,8 +921,8 @@ TEST_F(NetworkPortalDetectorImplTest, RequestTimeouts) {
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE, 1)
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
->Check());
}
@@ -962,8 +962,8 @@ TEST_F(NetworkPortalDetectorImplTest, StartDetectionIfIdle) {
ASSERT_TRUE(
MakeResultHistogramChecker()
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE, 1)
- ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE, 1)
+ ->Expect(captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE, 1)
->Check());
}
« chrome/browser/captive_portal/captive_portal_service.cc ('K') | « chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc ('k') | chrome/browser/chromeos/net/network_portal_notification_controller.cc » ('j') | components/captive_portal/captive_portal_detector.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698