Provide IPConfigs in networkingPrivate.GetProperties

chrome/test/data/extensions/api_test/networking/test.js

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var callbackPass = chrome.test.callbackPass;
 var callbackFail = chrome.test.callbackFail;
 var assertTrue = chrome.test.assertTrue;
 var assertFalse = chrome.test.assertFalse;
 var assertEq = chrome.test.assertEq;
 
@@ skipping 117 matching lines @@
         assertEq([{
                     "ConnectionState": "Connected",
                     "Ethernet": {
                       "Authentication": "None"
                     },
                     "GUID": "stub_ethernet",
                     "Name": "eth0",
                     "Type": "Ethernet"
                   },
                   {
+                    "Connectable": true,
                     "ConnectionState": "Connected",
                     "GUID": "stub_wifi1",
                     "Name": "wifi1",
                     "Type": "WiFi",
                     "WiFi": {
                       "Security": "WEP-PSK",
-                      "SignalStrength": 0
+                      "SignalStrength": 40
                     }
                   },
                   {
                     "ConnectionState": "Connected",
                     "GUID": "stub_vpn1",
                     "Name": "vpn1",
                     "Type": "VPN",
                   },
                   {
+                    "Connectable": true,
                     "ConnectionState": "NotConnected",
                     "GUID": "stub_wifi2",
                     "Name": "wifi2_PSK",
                     "Type": "WiFi",
                     "WiFi": {
                       "Security": "WPA-PSK",
                       "SignalStrength": 80
                     }
-                  },
-                  {
-                    "Cellular": {
-                      "ActivationState": "not-activated",
-                      "NetworkTechnology": "GSM",
-                      "RoamingState": "home"
-                    },
-                    "ConnectionState": "NotConnected",
-                    "GUID": "stub_cellular1",
-                    "Name": "cellular1",
-                    "Type": "Cellular"
                   }], result);
       }));
   },
   function getVisibleNetworksWifi() {
     chrome.networkingPrivate.getVisibleNetworks(
       "WiFi",
       callbackPass(function(result) {
         assertEq([{
+                    "Connectable": true,
                     "ConnectionState": "Connected",
                     "GUID": "stub_wifi1",
                     "Name": "wifi1",
                     "Type": "WiFi",
                     "WiFi": {
                       "Security": "WEP-PSK",
-                      "SignalStrength": 0
+                      "SignalStrength": 40
                     }
                   },
                   {
+                    "Connectable": true,
                     "ConnectionState": "NotConnected",
                     "GUID": "stub_wifi2",
                     "Name": "wifi2_PSK",
                     "Type": "WiFi",
                     "WiFi": {
                       "Security": "WPA-PSK",
                       "SignalStrength": 80
                     }
                   }
                   ], result);
       }));
   },
   function requestNetworkScan() {
     // Connected or Connecting networks should be listed first, sorted by type.
     var expected = ["stub_ethernet",
                     "stub_wifi1",
                     "stub_vpn1",
-                    "stub_wifi2",
-                    "stub_cellular1"];
+                    "stub_wifi2"];
     var done = chrome.test.callbackAdded();
     var listener = new privateHelpers.listListener(expected, done);
     chrome.networkingPrivate.onNetworkListChanged.addListener(
       listener.listenForChanges);
     chrome.networkingPrivate.requestNetworkScan();
   },
   function getProperties() {
     chrome.networkingPrivate.getProperties(
-      "stub_wifi2",
+      "stub_wifi1",
       callbackPass(function(result) {
-        assertEq({
-                   "ConnectionState": "NotConnected",
-                   "GUID": "stub_wifi2",
-                   "Name": "wifi2_PSK",
+        assertEq({ "Connectable": true,
+                   "ConnectionState": "Connected",
+                   "GUID": "stub_wifi1",
+                   "IPConfigs": [{
+                     "Gateway": "0.0.0.1",
+                     "IPAddress": "0.0.0.0",
+                     "RoutingPrefix": 0,
+                     "Type": "IPv4"
+                   }],
+                   "Name": "wifi1",
                    "Type": "WiFi",
                    "WiFi": {
-                     "Frequency": 5000,
-                     "FrequencyList": [2400, 5000],
-                     "SSID": "wifi2_PSK",
-                     "Security": "WPA-PSK",
-                     "SignalStrength": 80
+                     "Frequency": 2400,
+                     "FrequencyList": [2400],
+                     "SSID": "wifi1",
+                     "Security": "WEP-PSK",
+                     "SignalStrength": 40
                    }
                  }, result);
       }));
   },
   function getManagedProperties() {
     chrome.networkingPrivate.getManagedProperties(
       "stub_wifi2",
       callbackPass(function(result) {
         assertEq({
+                   "Connectable": {
+                     "Active": true,
+                     "Effective": "Unmanaged"
+                   },
                    "ConnectionState": {
                      "Active": "NotConnected",
                      "Effective": "Unmanaged"
                    },
                    "GUID": "stub_wifi2",
                    "Name": {
                      "Active": "wifi2_PSK",
                      "Effective": "UserPolicy",
                      "UserPolicy": "My WiFi Network"
                    },
@@ skipping 53 matching lines @@
                 done();
               }));
           }));
       }));
   },
   function getState() {
     chrome.networkingPrivate.getState(
       "stub_wifi2",
       callbackPass(function(result) {
         assertEq({
+          "Connectable": true,
           "ConnectionState": "NotConnected",
           "GUID": "stub_wifi2",
           "Name": "wifi2_PSK",
           "Type": "WiFi",
           "WiFi": {
             "Security": "WPA-PSK",
             "SignalStrength": 80
           }
         }, result);
       }));
@@ skipping 18 matching lines @@
     var listener =
         new privateHelpers.watchForStateChanges(network, expectedStates, done);
     chrome.networkingPrivate.startDisconnect(network, callbackPass());
   },
   function onNetworkListChangedEvent() {
     // Connecting to wifi2 should set wifi1 to offline. Connected or Connecting
     // networks should be listed first, sorted by type.
     var expected = ["stub_ethernet",
                     "stub_wifi2",
                     "stub_vpn1",
-                    "stub_wifi1",
-                    "stub_cellular1"];
+                    "stub_wifi1"];
     var done = chrome.test.callbackAdded();
     var listener = new privateHelpers.listListener(expected, done);
     chrome.networkingPrivate.onNetworkListChanged.addListener(
       listener.listenForChanges);
     var network = "stub_wifi2";
     chrome.networkingPrivate.startConnect(network, callbackPass());
   },
   function verifyDestination() {
     chrome.networkingPrivate.verifyDestination(
       verificationProperties,
@@ skipping 53 matching lines @@
     var listener =
         new privateHelpers.watchForCaptivePortalState('wifi', 'Online', done);
     chrome.test.sendMessage('notifyPortalDetectorObservers');
   },
 ];
 
 var testToRun = window.location.search.substring(1);
 chrome.test.runTests(availableTests.filter(function(op) {
   return op.name == testToRun;
 }));