Add types to networkigPrivate IDL

chrome/test/data/extensions/api_test/networking_private/chromeos/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.
 
 // The expectations in this test for the Chrome OS implementation. See
 // networking_private_chromeos_apitest.cc for more info.
 
 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;
 
 // Test properties for the verification API.
 var verificationProperties = {
-  "certificate": "certificate",
-  "intermediateCertificates": ["ica1", "ica2", "ica3"],
-  "publicKey": "cHVibGljX2tleQ==",  // Base64("public_key")
-  "nonce": "nonce",
-  "signedData": "c2lnbmVkX2RhdGE=",  // Base64("signed_data")
-  "deviceSerial": "device_serial",
-  "deviceSsid": "Device 0123",
-  "deviceBssid": "00:01:02:03:04:05"
+  certificate: 'certificate',
+  intermediateCertificates: ['ica1', 'ica2', 'ica3'],
+  publicKey: 'cHVibGljX2tleQ==',  // Base64('public_key')
+  nonce: 'nonce',
+  signedData: 'c2lnbmVkX2RhdGE=',  // Base64('signed_data')
+  deviceSerial: 'device_serial',
+  deviceSsid: 'Device 0123',
+  deviceBssid: '00:01:02:03:04:05'
 };
 
 var privateHelpers = {
   // Watches for the states |expectedStates| in reverse order. If all states
   // were observed in the right order, succeeds and calls |done|. If any
   // unexpected state is observed, fails.
   watchForStateChanges: function(network, expectedStates, done) {
     var self = this;
     var collectProperties = function(properties) {
       var finishTest = function() {
@@ skipping 37 matching lines @@
           self.onPortalDetectionCompleted);
       done();
     };
     chrome.networkingPrivate.onPortalDetectionCompleted.addListener(
         self.onPortalDetectionCompleted);
   }
 };
 
 var availableTests = [
   function startConnect() {
-    chrome.networkingPrivate.startConnect("stub_wifi2_guid", callbackPass());
+    chrome.networkingPrivate.startConnect('stub_wifi2_guid', callbackPass());
   },
   function startDisconnect() {
     // Must connect to a network before we can disconnect from it.
     chrome.networkingPrivate.startConnect(
-        "stub_wifi2_guid", callbackPass(function() {
-          chrome.networkingPrivate.startDisconnect("stub_wifi2_guid",
+        'stub_wifi2_guid', callbackPass(function() {
+          chrome.networkingPrivate.startDisconnect('stub_wifi2_guid',
                                                    callbackPass());
         }));
   },
   function startActivate() {
     // Must connect to a network before we can activate it.
     chrome.networkingPrivate.startConnect(
-        "stub_cellular1_guid", callbackPass(function() {
+        'stub_cellular1_guid', callbackPass(function() {
           chrome.networkingPrivate.startActivate(
-            "stub_cellular1_guid", callbackPass(function() {
-              chrome.networkingPrivate.getState(
-                "stub_cellular1_guid", callbackPass(function(state) {
-                  assertEq("Activated", state.Cellular.ActivationState);
+              'stub_cellular1_guid', callbackPass(function() {
+                chrome.networkingPrivate.getState(
+                    'stub_cellular1_guid', callbackPass(function(state) {
+                      assertEq(chrome.networkingPrivate.ActivationStateType
+                                   .Activated,
+                               state.Cellular.ActivationState);
+                    }));
               }));
-            }));
         }));
   },
   function startConnectNonexistent() {
     chrome.networkingPrivate.startConnect(
-      "nonexistent_path",
-      callbackFail("Error.InvalidNetworkGuid"));
+      'nonexistent_path',
+      callbackFail('Error.InvalidNetworkGuid'));
   },
   function startDisconnectNonexistent() {
     chrome.networkingPrivate.startDisconnect(
-      "nonexistent_path",
-      callbackFail("Error.InvalidNetworkGuid"));
+      'nonexistent_path',
+      callbackFail('Error.InvalidNetworkGuid'));
   },
   function startGetPropertiesNonexistent() {
     chrome.networkingPrivate.getProperties(
-      "nonexistent_path",
-      callbackFail("Error.InvalidNetworkGuid"));
+      'nonexistent_path',
+      callbackFail('Error.InvalidNetworkGuid'));
   },
   function createNetwork() {
     chrome.networkingPrivate.createNetwork(
       false,  // shared
-      { "Type": "WiFi",
-        "GUID": "ignored_guid",
-        "WiFi": {
-          "SSID": "wifi_created",
-          "Security": "WEP-PSK"
+      { Type: chrome.networkingPrivate.NetworkType.WiFi,
+        GUID: 'ignored_guid',
+        WiFi: {
+          SSID: 'wifi_created',
+          Security: 'WEP-PSK'
         }
       },
       callbackPass(function(guid) {
-        assertFalse(guid == "");
-        assertFalse(guid == "ignored_guid");
+        assertFalse(guid == '');
+        assertFalse(guid == 'ignored_guid');
         chrome.networkingPrivate.getProperties(
-          guid,
-          callbackPass(function(properties) {
-            assertEq("WiFi", properties.Type);
-            assertEq(guid, properties.GUID);
-            assertEq("wifi_created", properties.WiFi.SSID);
-            assertEq("WEP-PSK", properties.WiFi.Security);
-          }));
+            guid, callbackPass(function(properties) {
+              assertEq(chrome.networkingPrivate.NetworkType.WiFi,
+                       properties.Type);
+              assertEq(guid, properties.GUID);
+              assertEq('wifi_created', properties.WiFi.SSID);
+              assertEq('WEP-PSK', properties.WiFi.Security);
+            }));
       }));
   },
   function forgetNetwork() {
     var kNumNetworks = 2;
-    var kTestNetworkGuid = "stub_wifi1_guid";
+    var kTestNetworkGuid = 'stub_wifi1_guid';
     function guidExists(networks, guid) {
       for (var n of networks) {
         if (n.GUID == kTestNetworkGuid)
           return true;
       }
       return false;
     }
-    chrome.networkingPrivate.getNetworks(
-      { "networkType": "WiFi", "visible": true, "configured": true },
-      callbackPass(function(networks) {
-        assertEq(kNumNetworks, networks.length);
-        assertTrue(guidExists(networks, kTestNetworkGuid));
-        chrome.networkingPrivate.forgetNetwork(
+    var filter = {
+      networkType: chrome.networkingPrivate.NetworkType.WiFi,
+      visible: true,
+      configured : true
+    };
+    chrome.networkingPrivate.getNetworks(filter, callbackPass(function(
+                                                     networks) {
+      assertEq(kNumNetworks, networks.length);
+      assertTrue(guidExists(networks, kTestNetworkGuid));
+      chrome.networkingPrivate.forgetNetwork(
           kTestNetworkGuid, callbackPass(function() {
             chrome.networkingPrivate.getNetworks(
-              { "networkType": "WiFi", "visible": true, "configured": true },
-              callbackPass(function(networks) {
-                assertEq(kNumNetworks - 1, networks.length);
-                assertFalse(guidExists(networks, kTestNetworkGuid));
-              }));
+                filter, callbackPass(function(networks) {
+                  assertEq(kNumNetworks - 1, networks.length);
+                  assertFalse(guidExists(networks, kTestNetworkGuid));
+                }));
           }));
-      }));
+    }));
   },
   function getNetworks() {
     // Test 'type' and 'configured'.
+    var filter = {
+      networkType: chrome.networkingPrivate.NetworkType.WiFi,
+      configured: true
+    };
     chrome.networkingPrivate.getNetworks(
-      { "networkType": "WiFi", "configured": true },
+      filter,
       callbackPass(function(result) {
         assertEq([{
-          "Connectable": true,
-          "ConnectionState": "Connected",
-          "GUID": "stub_wifi1_guid",
-          "Name": "wifi1",
-          "Type": "WiFi",
-          "Source":"User",
-          "WiFi": {
-            "Security": "WEP-PSK",
-            "SignalStrength": 40
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.Connected,
+          GUID: 'stub_wifi1_guid',
+          Name: 'wifi1',
+          Type: chrome.networkingPrivate.NetworkType.WiFi,

[pneubeck (no reviews), 2015/03/27 19:13:43]

as in some other place where you did that already, you could define
'NetworkType' as a short-cut at the top of the file.

[stevenjb, 2015/03/27 22:11:14]

Done.

+          Source: 'User',
+          WiFi: {
+            Security: 'WEP-PSK',
+            SignalStrength: 40
           }
         }, {
-          "GUID": "stub_wifi2_guid",
-          "Name": "wifi2_PSK",
-          "Type": "WiFi",
-          "Source":"User",
-          "WiFi": {
-            "Security": "WPA-PSK",
+          GUID: 'stub_wifi2_guid',
+          Name: 'wifi2_PSK',
+          Type: chrome.networkingPrivate.NetworkType.WiFi,
+          Source: 'User',
+          WiFi: {
+            Security: 'WPA-PSK',
           }
         }], result);
 
         // Test 'visible' (and 'configured').
+        filter.visible = true;
         chrome.networkingPrivate.getNetworks(
-          { "networkType": "WiFi", "visible": true, "configured": true },
+          filter,
           callbackPass(function(result) {
             assertEq([{
-              "Connectable": true,
-              "ConnectionState": "Connected",
-              "GUID": "stub_wifi1_guid",
-              "Name": "wifi1",
-              "Source":"User",
-              "Type": "WiFi",
-              "WiFi": {
-                "Security": "WEP-PSK",
-                "SignalStrength": 40
+              Connectable: true,
+              ConnectionState:
+                  chrome.networkingPrivate.ConnectionStateType.Connected,
+              GUID: 'stub_wifi1_guid',
+              Name: 'wifi1',
+              Source: 'User',
+              Type: chrome.networkingPrivate.NetworkType.WiFi,
+              WiFi: {
+                Security: 'WEP-PSK',
+                SignalStrength: 40
               }
             }], result);
 
             // Test 'limit'.
+            filter = {
+              networkType: chrome.networkingPrivate.NetworkType.All,
+              limit: 1
+            };
             chrome.networkingPrivate.getNetworks(
-              { "networkType": "All", "limit": 1 },
+              filter,
               callbackPass(function(result) {
                 assertEq([{
-                  "ConnectionState": "Connected",
-                  "Ethernet": {
-                    "Authentication": "None"
+                  ConnectionState:
+                      chrome.networkingPrivate.ConnectionStateType.Connected,
+                  Ethernet: {
+                    Authentication: 'None'
                   },
-                  "GUID": "stub_ethernet_guid",
-                  "Name": "eth0",
-                  "Source":"Device",
-                  "Type": "Ethernet"
+                  GUID: 'stub_ethernet_guid',
+                  Name: 'eth0',
+                  Source: 'Device',
+                  Type: chrome.networkingPrivate.NetworkType.Ethernet
                 }], result);
               }));
           }));
       }));
   },
   function getVisibleNetworks() {
     chrome.networkingPrivate.getVisibleNetworks(
-      "All",
+      chrome.networkingPrivate.NetworkType.All,
       callbackPass(function(result) {
         assertEq([{
-                    "ConnectionState": "Connected",
-                    "Ethernet": {
-                      "Authentication": "None"
-                    },
-                    "GUID": "stub_ethernet_guid",
-                    "Name": "eth0",
-                    "Source":"Device",
-                    "Type": "Ethernet"
-                  },
-                  {
-                    "Connectable": true,
-                    "ConnectionState": "Connected",
-                    "GUID": "stub_wifi1_guid",
-                    "Name": "wifi1",
-                    "Source": "User",
-                    "Type": "WiFi",
-                    "WiFi": {
-                      "Security": "WEP-PSK",
-                      "SignalStrength": 40
-                    }
-                  },
-                  {
-                    "Connectable": true,
-                    "ConnectionState": "Connected",
-                    "GUID": "stub_wimax_guid",
-                    "Name": "wimax",
-                    "Source": "User",
-                    "Type": "WiMAX",
-                    "WiMAX": {
-                      "SignalStrength": 40
-                    }
-                  },
-                  {
-                    "ConnectionState": "Connected",
-                    "GUID": "stub_vpn1_guid",
-                    "Name": "vpn1",
-                    "Source": "User",
-                    "Type": "VPN",
-                    "VPN": {
-                      "Type":"OpenVPN"
-                    }
-                  },
-                  {
-                    "ConnectionState": "NotConnected",
-                    "GUID": "stub_vpn2_guid",
-                    "Name": "vpn2",
-                    "Source": "User",
-                    "Type": "VPN",
-                    "VPN": {
-                      "ThirdPartyVPN": {
-                        "ExtensionID": "third_party_provider_extension_id"
-                      },
-                      "Type": "ThirdPartyVPN"
-                    }
-                  },
-                  {
-                    "Connectable": true,
-                    "ConnectionState": "NotConnected",
-                    "GUID": "stub_wifi2_guid",
-                    "Name": "wifi2_PSK",
-                    "Source": "User",
-                    "Type": "WiFi",
-                    "WiFi": {
-                      "Security": "WPA-PSK",
-                      "SignalStrength": 80
-                    }
-                  }], result);
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.Connected,
+          Ethernet: {
+            Authentication: 'None'
+          },
+          GUID: 'stub_ethernet_guid',
+          Name: 'eth0',
+          Source: 'Device',
+          Type: chrome.networkingPrivate.NetworkType.Ethernet
+        }, {
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.Connected,
+          GUID: 'stub_wifi1_guid',
+          Name: 'wifi1',
+          Source: 'User',
+          Type: chrome.networkingPrivate.NetworkType.WiFi,
+          WiFi: {
+            Security: 'WEP-PSK',
+            SignalStrength: 40
+          }
+        }, {
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.Connected,
+          GUID: 'stub_wimax_guid',
+          Name: 'wimax',
+          Source: 'User',
+          Type: chrome.networkingPrivate.NetworkType.WiMAX,
+          WiMAX: {
+            SignalStrength: 40
+          }
+        },  {
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.Connected,
+          GUID: 'stub_vpn1_guid',
+          Name: 'vpn1',
+          Source: 'User',
+          Type: chrome.networkingPrivate.NetworkType.VPN,
+          VPN: {
+            Type: 'OpenVPN'
+          }
+        }, {
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.NotConnected,
+          GUID: 'stub_vpn2_guid',
+          Name: 'vpn2',
+          Source: 'User',
+          Type: chrome.networkingPrivate.NetworkType.VPN,
+          VPN: {
+            ThirdPartyVPN: {
+              ExtensionID: 'third_party_provider_extension_id'
+            },
+            Type: 'ThirdPartyVPN'
+          }
+        }, {
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.NotConnected,
+          GUID: 'stub_wifi2_guid',
+          Name: 'wifi2_PSK',
+          Source: 'User',
+          Type: chrome.networkingPrivate.NetworkType.WiFi,
+          WiFi: {
+            Security: 'WPA-PSK',
+            SignalStrength: 80
+          }
+        }], result);
       }));
   },
   function getVisibleNetworksWifi() {
     chrome.networkingPrivate.getVisibleNetworks(
-      "WiFi",
+      chrome.networkingPrivate.NetworkType.WiFi,
       callbackPass(function(result) {
         assertEq([{
-                    "Connectable": true,
-                    "ConnectionState": "Connected",
-                    "GUID": "stub_wifi1_guid",
-                    "Name": "wifi1",
-                    "Source": "User",
-                    "Type": "WiFi",
-                    "WiFi": {
-                      "Security": "WEP-PSK",
-                      "SignalStrength": 40
-                    }
-                  },
-                  {
-                    "Connectable": true,
-                    "ConnectionState": "NotConnected",
-                    "GUID": "stub_wifi2_guid",
-                    "Name": "wifi2_PSK",
-                    "Source": "User",
-                    "Type": "WiFi",
-                    "WiFi": {
-                      "Security": "WPA-PSK",
-                      "SignalStrength": 80
-                    }
-                  }
-                  ], result);
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.Connected,
+          GUID: 'stub_wifi1_guid',
+          Name: 'wifi1',
+          Source: 'User',
+          Type: chrome.networkingPrivate.NetworkType.WiFi,
+          WiFi: {
+            Security: 'WEP-PSK',
+            SignalStrength: 40
+          }
+        }, {
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.NotConnected,
+          GUID: 'stub_wifi2_guid',
+          Name: 'wifi2_PSK',
+          Source: 'User',
+          Type: chrome.networkingPrivate.NetworkType.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_guid",
-                    "stub_wifi1_guid",
-                    "stub_wimax_guid",
-                    "stub_vpn1_guid",
-                    "stub_vpn2_guid",
-                    "stub_wifi2_guid"];
+    var expected = ['stub_ethernet_guid',
+                    'stub_wifi1_guid',
+                    'stub_wimax_guid',
+                    'stub_vpn1_guid',
+                    'stub_vpn2_guid',
+                    'stub_wifi2_guid'];
     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_wifi1_guid",
+      'stub_wifi1_guid',
       callbackPass(function(result) {
-        assertEq({ "Connectable": true,
-                   "ConnectionState": "Connected",
-                   "GUID": "stub_wifi1_guid",
-                   "IPAddressConfigType": "Static",
-                   "IPConfigs": [{
-                     "Gateway": "0.0.0.1",
-                     "IPAddress": "0.0.0.0",
-                     "RoutingPrefix": 0,
-                     "Type": "IPv4"
-                   }],
-                   "MacAddress": "00:11:22:AA:BB:CC",
-                   "Name": "wifi1",
-                   "StaticIPConfig": {
-                     "IPAddress": "1.2.3.4",
-                     "Type": "IPv4"
-                   },
-                   "Type": "WiFi",
-                   "WiFi": {
-                     "HexSSID": "7769666931", // "wifi1"
-                     "Frequency": 2400,
-                     "FrequencyList": [2400],
-                     "SSID": "wifi1",
-                     "Security": "WEP-PSK",
-                     "SignalStrength": 40
-                   }
-                 }, result);
+        assertEq({
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.Connected,
+          GUID: 'stub_wifi1_guid',
+          IPAddressConfigType: chrome.networkingPrivate.IPConfigType.Static,
+          IPConfigs: [{
+            Gateway: '0.0.0.1',
+            IPAddress: '0.0.0.0',
+            RoutingPrefix: 0,
+            Type: 'IPv4'
+          }],
+          MacAddress: '00:11:22:AA:BB:CC',
+          Name: 'wifi1',
+          StaticIPConfig: {
+            IPAddress: '1.2.3.4',
+            Type: 'IPv4'
+          },
+          Type: chrome.networkingPrivate.NetworkType.WiFi,
+          WiFi: {
+            HexSSID: '7769666931', // 'wifi1'
+            Frequency: 2400,
+            FrequencyList: [2400],
+            SSID: 'wifi1',
+            Security: 'WEP-PSK',
+            SignalStrength: 40
+          }
+        }, result);
       }));
   },
   function getPropertiesCellular() {
     chrome.networkingPrivate.getProperties(
-      "stub_cellular1_guid",
+      'stub_cellular1_guid',
       callbackPass(function(result) {
-        assertEq({ "Cellular": {
-                     "ActivationState": "NotActivated",
-                     "AllowRoaming": false,
-                     "AutoConnect": true,
-                     "Carrier": "Cellular1_Carrier",
-                     "HomeProvider": {
-                       "Country": "us",
-                       "Name": "Cellular1_Provider"
-                     },
-                     "NetworkTechnology": "GSM",
-                     "RoamingState": "Home"
-                   },
-                   "ConnectionState": "NotConnected",
-                   "GUID": "stub_cellular1_guid",
-                   "Name": "cellular1",
-                   "Type": "Cellular"
-                 }, result);
+        assertEq({
+          Cellular: {
+            ActivationState:
+                chrome.networkingPrivate.ActivationStateType.NotActivated,
+            AllowRoaming: false,
+            AutoConnect: true,
+            Carrier: 'Cellular1_Carrier',
+            HomeProvider: {
+              Country: 'us',
+              Name: 'Cellular1_Provider'
+            },
+            NetworkTechnology: 'GSM',
+            RoamingState: 'Home'
+          },
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.NotConnected,
+          GUID: 'stub_cellular1_guid',
+          Name: 'cellular1',
+          Type: chrome.networkingPrivate.NetworkType.Cellular,
+        }, result);
       }));
   },
   function getManagedProperties() {
     chrome.networkingPrivate.getManagedProperties(
-      "stub_wifi2",
+      'stub_wifi2',
       callbackPass(function(result) {
         assertEq({
-                   "Connectable": true,
-                   "ConnectionState": "NotConnected",
-                   "GUID": "stub_wifi2",
-                   "Name": {
-                     "Active": "wifi2_PSK",
-                     "Effective": "UserPolicy",
-                     "UserPolicy": "My WiFi Network"
-                   },
-                   "Source": "UserPolicy",
-                   "Type": {
-                     "Active": "WiFi",
-                     "Effective": "UserPolicy",
-                     "UserPolicy": "WiFi"
-                   },
-                   "WiFi": {
-                     "AutoConnect": {
-                       "Active": false,
-                       "UserEditable": true
-                     },
-                     "HexSSID": {
-                       "Active": "77696669325F50534B", // "wifi2_PSK"
-                       "Effective": "UserPolicy",
-                       "UserPolicy": "77696669325F50534B"
-                     },
-                     "Frequency" : 5000,
-                     "FrequencyList" : [2400, 5000],
-                     "Passphrase": {
-                       "Effective": "UserSetting",
-                       "UserEditable": true,
-                       "UserSetting": "FAKE_CREDENTIAL_VPaJDV9x"
-                     },
-                     "SSID": {
-                       "Active": "wifi2_PSK",
-                       "Effective": "UserPolicy",
-                     },
-                     "Security": {
-                       "Active": "WPA-PSK",
-                       "Effective": "UserPolicy",
-                       "UserPolicy": "WPA-PSK"
-                     },
-                     "SignalStrength": 80,
-                   }
-                 }, result);
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.NotConnected,
+          GUID: 'stub_wifi2',
+          Name: {
+            Active: 'wifi2_PSK',
+            Effective: 'UserPolicy',
+            UserPolicy: 'My WiFi Network'
+          },
+          Source: 'UserPolicy',
+          Type: {
+            Active: chrome.networkingPrivate.NetworkType.WiFi,
+            Effective: 'UserPolicy',
+            UserPolicy: chrome.networkingPrivate.NetworkType.WiFi
+          },
+          WiFi: {
+            AutoConnect: {
+              Active: false,
+              UserEditable: true
+            },
+            HexSSID: {
+              Active: '77696669325F50534B', // 'wifi2_PSK'
+              Effective: 'UserPolicy',
+              UserPolicy: '77696669325F50534B'
+            },
+            Frequency : 5000,
+            FrequencyList : [2400, 5000],
+            Passphrase: {
+              Effective: 'UserSetting',
+              UserEditable: true,
+              UserSetting: 'FAKE_CREDENTIAL_VPaJDV9x'
+            },
+            SSID: {
+              Active: 'wifi2_PSK',
+              Effective: 'UserPolicy',
+            },
+            Security: {
+              Active: 'WPA-PSK',
+              Effective: 'UserPolicy',
+              UserPolicy: 'WPA-PSK'
+            },
+            SignalStrength: 80,
+          }
+        }, result);
       }));
   },
   function setWiFiProperties() {
     var done = chrome.test.callbackAdded();
-    var network_guid = "stub_wifi1_guid";
+    var network_guid = 'stub_wifi1_guid';
     chrome.networkingPrivate.getProperties(
         network_guid,
         callbackPass(function(result) {
           assertEq(network_guid, result.GUID);
           var new_properties = {
             Priority: 1,
             WiFi: {
               AutoConnect: true
             },
             IPAddressConfigType: 'Static',
@@ skipping 18 matching lines @@
                       assertTrue('StaticIPConfig' in result);
                       assertEq('1.2.3.4',
                                result['StaticIPConfig']['IPAddress']);
                       done();
                     }));
               }));
         }));
   },
   function setVPNProperties() {
     var done = chrome.test.callbackAdded();
-    var network_guid = "stub_vpn1_guid";
+    var network_guid = 'stub_vpn1_guid';
     chrome.networkingPrivate.getProperties(
         network_guid,
         callbackPass(function(result) {
           assertEq(network_guid, result.GUID);
           var new_properties = {
             Priority: 1,
             VPN: {
               Host: 'vpn.host1'
             }
           };
@@ skipping 11 matching lines @@
                       assertEq('vpn.host1', result['VPN']['Host']);
                       // Ensure that the GUID doesn't change.
                       assertEq(network_guid, result.GUID);
                       done();
                     }));
               }));
         }));
   },
   function getState() {
     chrome.networkingPrivate.getState(
-      "stub_wifi2_guid",
+      'stub_wifi2_guid',
       callbackPass(function(result) {
         assertEq({
-          "Connectable": true,
-          "ConnectionState": "NotConnected",
-          "GUID": "stub_wifi2_guid",
-          "Name": "wifi2_PSK",
-          "Source": "User",
-          "Type": "WiFi",
-          "WiFi": {
-            "Security": "WPA-PSK",
-            "SignalStrength": 80
+          Connectable: true,
+          ConnectionState:
+              chrome.networkingPrivate.ConnectionStateType.NotConnected,
+          GUID: 'stub_wifi2_guid',
+          Name: 'wifi2_PSK',
+          Source: 'User',
+          Type: chrome.networkingPrivate.NetworkType.WiFi,
+          WiFi: {
+            Security: 'WPA-PSK',
+            SignalStrength: 80
           }
         }, result);
       }));
   },
   function getStateNonExistent() {
     chrome.networkingPrivate.getState(
       'non_existent',
       callbackFail('Error.InvalidNetworkGuid'));
   },
   function onNetworksChangedEventConnect() {
-    var network = "stub_wifi2_guid";
+    var network = 'stub_wifi2_guid';
     var done = chrome.test.callbackAdded();
-    var expectedStates = ["Connected"];
+    var expectedStates =
+        [chrome.networkingPrivate.ConnectionStateType.Connected];
     var listener =
         new privateHelpers.watchForStateChanges(network, expectedStates, done);
     chrome.networkingPrivate.startConnect(network, callbackPass());
   },
   function onNetworksChangedEventDisconnect() {
-    var network = "stub_wifi1_guid";
+    var network = 'stub_wifi1_guid';
     var done = chrome.test.callbackAdded();
-    var expectedStates = ["NotConnected"];
+    var expectedStates =
+        [chrome.networkingPrivate.ConnectionStateType.NotConnected];
     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_guid",
-                    "stub_wifi2_guid",
-                    "stub_wimax_guid",
-                    "stub_vpn1_guid",
-                    "stub_wifi1_guid",
-                    "stub_vpn2_guid"];
+    var expected = ['stub_ethernet_guid',
+                    'stub_wifi2_guid',
+                    'stub_wimax_guid',
+                    'stub_vpn1_guid',
+                    'stub_wifi1_guid',
+                    'stub_vpn2_guid'];
     var done = chrome.test.callbackAdded();
     var listener = new privateHelpers.listListener(expected, done);
     chrome.networkingPrivate.onNetworkListChanged.addListener(
       listener.listenForChanges);
-    var network = "stub_wifi2_guid";
+    var network = 'stub_wifi2_guid';
     chrome.networkingPrivate.startConnect(network, callbackPass());
   },
   function verifyDestination() {
     chrome.networkingPrivate.verifyDestination(
       verificationProperties,
       callbackPass(function(isValid) {
         assertTrue(isValid);
       }));
   },
   function verifyAndEncryptCredentials() {
-    var network_guid = "stub_wifi2_guid";
+    var network_guid = 'stub_wifi2_guid';
     chrome.networkingPrivate.verifyAndEncryptCredentials(
       verificationProperties,
       network_guid,
       callbackPass(function(result) {
-        assertEq("encrypted_credentials", result);
+        assertEq('encrypted_credentials', result);
       }));
   },
   function verifyAndEncryptData() {
     chrome.networkingPrivate.verifyAndEncryptData(
       verificationProperties,
-      "data",
+      'data',
       callbackPass(function(result) {
-        assertEq("encrypted_data", result);
+        assertEq('encrypted_data', result);
       }));
   },
   function setWifiTDLSEnabledState() {
     chrome.networkingPrivate.setWifiTDLSEnabledState(
-      "aa:bb:cc:dd:ee:ff",
-      true,
-      callbackPass(function(result) {
-        assertEq("Connected", result);
-      }));
+        'aa:bb:cc:dd:ee:ff', true, callbackPass(function(result) {
+          assertEq(chrome.networkingPrivate.ConnectionStateType.Connected,
+                   result);
+        }));
   },
   function getWifiTDLSStatus() {
     chrome.networkingPrivate.getWifiTDLSStatus(
-      "aa:bb:cc:dd:ee:ff",
-      callbackPass(function(result) {
-        assertEq("Connected", result);
-      }));
+        'aa:bb:cc:dd:ee:ff', callbackPass(function(result) {
+          assertEq(chrome.networkingPrivate.ConnectionStateType.Connected,
+                   result);
+        }));
   },
   function getCaptivePortalStatus() {
     var networks = [['stub_ethernet_guid', 'Online'],
                     ['stub_wifi1_guid', 'Offline'],
                     ['stub_wifi2_guid', 'Portal'],
                     ['stub_cellular1_guid', 'ProxyAuthRequired'],
                     ['stub_vpn1_guid', 'Unknown']];
     networks.forEach(function(network) {
       var guid = network[0];
       var expectedStatus = network[1];
@@ skipping 10 matching lines @@
         new privateHelpers.watchForCaptivePortalState(
             'wifi_guid', 'Online', done);
     chrome.test.sendMessage('notifyPortalDetectorObservers');
   },
 ];
 
 var testToRun = window.location.search.substring(1);
 chrome.test.runTests(availableTests.filter(function(op) {
   return op.name == testToRun;
 }));