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

Side by Side Diff: chrome/test/data/extensions/api_test/networking/test.js

Issue 291553006: Don't augment GUID in ONC merging. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comment. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chromeos/network/onc/onc_merger.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 var callbackPass = chrome.test.callbackPass; 5 var callbackPass = chrome.test.callbackPass;
6 var callbackFail = chrome.test.callbackFail; 6 var callbackFail = chrome.test.callbackFail;
7 var assertTrue = chrome.test.assertTrue; 7 var assertTrue = chrome.test.assertTrue;
8 var assertFalse = chrome.test.assertFalse; 8 var assertFalse = chrome.test.assertFalse;
9 var assertEq = chrome.test.assertEq; 9 var assertEq = chrome.test.assertEq;
10 10
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 callbackPass(function(result) { 316 callbackPass(function(result) {
317 assertEq({ 317 assertEq({
318 "Connectable": { 318 "Connectable": {
319 "Active": true, 319 "Active": true,
320 "Effective": "Unmanaged" 320 "Effective": "Unmanaged"
321 }, 321 },
322 "ConnectionState": { 322 "ConnectionState": {
323 "Active": "NotConnected", 323 "Active": "NotConnected",
324 "Effective": "Unmanaged" 324 "Effective": "Unmanaged"
325 }, 325 },
326 "GUID": { 326 "GUID": "stub_wifi2",
327 "Active": "stub_wifi2",
328 "Effective": "UserPolicy",
329 "UserPolicy": "stub_wifi2"
330 },
331 "Name": { 327 "Name": {
332 "Active": "wifi2_PSK", 328 "Active": "wifi2_PSK",
333 "Effective": "UserPolicy", 329 "Effective": "UserPolicy",
334 "UserPolicy": "My WiFi Network" 330 "UserPolicy": "My WiFi Network"
335 }, 331 },
336 "Type": { 332 "Type": {
337 "Active": "WiFi", 333 "Active": "WiFi",
338 "Effective": "UserPolicy", 334 "Effective": "UserPolicy",
339 "UserPolicy": "WiFi" 335 "UserPolicy": "WiFi"
340 }, 336 },
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 var listener = 506 var listener =
511 new privateHelpers.watchForCaptivePortalState('wifi', 'Online', done); 507 new privateHelpers.watchForCaptivePortalState('wifi', 'Online', done);
512 chrome.test.sendMessage('notifyPortalDetectorObservers'); 508 chrome.test.sendMessage('notifyPortalDetectorObservers');
513 }, 509 },
514 ]; 510 ];
515 511
516 var testToRun = window.location.search.substring(1); 512 var testToRun = window.location.search.substring(1);
517 chrome.test.runTests(availableTests.filter(function(op) { 513 chrome.test.runTests(availableTests.filter(function(op) {
518 return op.name == testToRun; 514 return op.name == testToRun;
519 })); 515 }));
OLDNEW
« no previous file with comments | « no previous file | chromeos/network/onc/onc_merger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698