chrome/browser/extensions/api/networking_private/networking_private_apitest.cc - Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Index: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

index 5f04dfd6ec473ad7b64da3776bd2926ff0d1ab37..20e8a0f5b3152dfc46d2eaf3caf4acb9ba962855 100644

--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

@@ -510,17 +510,17 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,

IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,

GetCaptivePortalStatus) {

NetworkPortalDetector::CaptivePortalState state;

- state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;

+ state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;

detector()->SetDetectionResultsForTesting("stub_ethernet", state);

- state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE;

+ state.status = captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE;

detector()->SetDetectionResultsForTesting("stub_wifi1", state);

- state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;

+ state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;

detector()->SetDetectionResultsForTesting("stub_wifi2", state);

state.status =

- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;

+ captive_portal::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;

detector()->SetDetectionResultsForTesting("stub_cellular1", state);

EXPECT_TRUE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_;

@@ -530,7 +530,7 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,

CaptivePortalNotification) {

detector()->SetDefaultNetworkPathForTesting("wifi");

NetworkPortalDetector::CaptivePortalState state;

- state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;

+ state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;

detector()->SetDetectionResultsForTesting("wifi", state);

TestListener listener(