chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc - Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal

Unified Diff: chrome/browser/chromeos/net/network_portal_notification_controller_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_notification_controller.cc ('k') | chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc » ('j') | components/captive_portal/captive_portal_detector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

index b502658d5b456b5bad28bfa64903a7cb20b0e1d2..26a2642ef8acc9e66f0c405ca24e5b6e510cd2ab 100644

--- a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

+++ b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

@@ -98,19 +98,19 @@ TEST_F(NetworkPortalNotificationControllerTest, NetworkStateChanged) {

NetworkPortalDetector::CaptivePortalState wifi_state;

// Notification is not displayed for online state.

- wifi_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;

+ wifi_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;

wifi_state.response_code = 204;

OnPortalDetectionCompleted(&wifi, wifi_state);

ASSERT_FALSE(HasNotification());

// Notification is displayed for portal state

- wifi_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;

+ wifi_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;

wifi_state.response_code = 200;

OnPortalDetectionCompleted(&wifi, wifi_state);

ASSERT_TRUE(HasNotification());

// Notification is closed for online state.

- wifi_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;

+ wifi_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;

wifi_state.response_code = 204;

OnPortalDetectionCompleted(&wifi, wifi_state);

ASSERT_FALSE(HasNotification());

@@ -119,7 +119,7 @@ TEST_F(NetworkPortalNotificationControllerTest, NetworkStateChanged) {

TEST_F(NetworkPortalNotificationControllerTest, NetworkChanged) {

NetworkState wifi1("wifi1");

NetworkPortalDetector::CaptivePortalState wifi1_state;

- wifi1_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;

+ wifi1_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;

wifi1_state.response_code = 200;

OnPortalDetectionCompleted(&wifi1, wifi1_state);

ASSERT_TRUE(HasNotification());

@@ -134,7 +134,7 @@ TEST_F(NetworkPortalNotificationControllerTest, NetworkChanged) {

NetworkState wifi2("wifi2");

NetworkPortalDetector::CaptivePortalState wifi2_state;

- wifi2_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;

+ wifi2_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;

wifi2_state.response_code = 204;

// Second network is in online state, so there shouldn't be any

@@ -150,7 +150,7 @@ TEST_F(NetworkPortalNotificationControllerTest, NetworkChanged) {

TEST_F(NetworkPortalNotificationControllerTest, NotificationUpdated) {

NetworkPortalDetector::CaptivePortalState portal_state;

- portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;

+ portal_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;

portal_state.response_code = 200;

// First network is behind a captive portal, so notification should