chrome/browser/chromeos/net/network_portal_detector_test_impl.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/chromeos/net/network_portal_detector_test_impl.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.h ('k') | chrome/browser/extensions/api/networking_private/networking_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ca2980ac8cb0dc8cb57e911fff70f1ec3245aea3..ae3ad1dc853893b808e0a632d01c63f6e7c6841c 100644

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

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

@@ -16,11 +16,14 @@ NetworkPortalDetectorTestImpl::~NetworkPortalDetectorTestImpl() {

}

void NetworkPortalDetectorTestImpl::SetDefaultNetworkPathForTesting(

- const std::string& service_path) {

- if (service_path.empty())

+ const std::string& service_path,

+ const std::string& guid) {

+ if (service_path.empty()) {

default_network_.reset();

- else

+ } else {

default_network_.reset(new NetworkState(service_path));

+ default_network_->SetGuid(guid);

+ }

}

void NetworkPortalDetectorTestImpl::SetDetectionResultsForTesting(