chrome/browser/extensions/api/networking_private/networking_private_apitest.cc - Issue 320063002: NetworkingPrivate API events should supply list of GUIDs, not service paths

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 320063002: NetworkingPrivate API events should supply list of GUIDs, not service paths (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 6 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/chromeos/login/wizard_controller_browsertest.cc ('K') | « chrome/browser/chromeos/net/network_portal_detector_test_impl.cc ('k') | chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc » ('j') | no next file with comments »
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 d2af19aa16ae8633b11a1f65eabae3d835251d89..bd8aca90cfcc9400d401cdc14a8035ec04eab392 100644

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

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

@@ -238,7 +238,7 @@ class ExtensionNetworkingPrivateApiTest

const bool add_to_visible = true;

// Tests need a known GUID, so use 'service_path'.

service_test_->AddServiceWithIPConfig(

- service_path, service_path /* guid */, name,

+ service_path, service_path + "_GUID" /* guid */, name,

type, state, "" /* ipconfig_path */,

add_to_visible, add_to_watchlist);

}

@@ -327,7 +327,7 @@ class ExtensionNetworkingPrivateApiTest

AddService("stub_wifi2", "wifi2_PSK", shill::kTypeWifi, shill::kStateIdle);

service_test_->SetServiceProperty("stub_wifi2",

shill::kGuidProperty,

- base::StringValue("stub_wifi2"));

+ base::StringValue("stub_wifi2_GUID"));

service_test_->SetServiceProperty("stub_wifi2",

shill::kSecurityProperty,

base::StringValue(shill::kSecurityPsk));

@@ -610,7 +610,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest,

IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest,

CaptivePortalNotification) {

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

+ detector()->SetDefaultNetworkPathForTesting("wifi", "wifi_GUID");

NetworkPortalDetector::CaptivePortalState state;

state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;

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