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

Unified Diff: chrome/browser/chromeos/customization_document_unittest.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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/managed/managed_user_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/customization_document_unittest.cc
diff --git a/chrome/browser/chromeos/customization_document_unittest.cc b/chrome/browser/chromeos/customization_document_unittest.cc
index c08dcfdc23bd208c449b17fe9f84259d5397fb0e..36b1bcb35ac9ca0efd93973fa850f9617f3bd45b 100644
--- a/chrome/browser/chromeos/customization_document_unittest.cc
+++ b/chrome/browser/chromeos/customization_document_unittest.cc
@@ -229,15 +229,18 @@ class ServicesCustomizationDocumentTest : public testing::Test {
DBusThreadManager::InitializeWithStub();
NetworkHandler::Initialize();
RunUntilIdle();
+ const NetworkState* default_network =
+ NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
std::string default_network_path =
- NetworkHandler::Get()->network_state_handler()->default_network_path();
+ default_network ? default_network->path() : "";
NetworkPortalDetector::InitializeForTesting(&network_portal_detector_);
NetworkPortalDetector::CaptivePortalState online_state;
online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
online_state.response_code = 204;
network_portal_detector_.SetDefaultNetworkPathForTesting(
- default_network_path);
+ default_network_path,
+ default_network ? default_network->guid() : "");
network_portal_detector_.SetDetectionResultsForTesting(
default_network_path, online_state);
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/managed/managed_user_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698