Adding policy support to the new network configuration stack.

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

Index: chrome/test/data/extensions/api_test/networking/test.js
diff --git a/chrome/test/data/extensions/api_test/networking/test.js b/chrome/test/data/extensions/api_test/networking/test.js
index b3f4069e1658ad21360a39ee8162a60cd63f2670..9c84eeca5afe2d9c985ccb131f665356edd7c318 100644
--- a/chrome/test/data/extensions/api_test/networking/test.js
+++ b/chrome/test/data/extensions/api_test/networking/test.js
@@ -25,7 +25,7 @@ var privateHelpers = {
     var collectProperties = function(properties) {
       var finishTest = function() {
         chrome.networkingPrivate.onNetworksChanged.removeListener(
-          self.watchForConnect);
+            self.onNetworkChange);
         done();
       };
       var expectedState = expectedStates.pop();
@@ -35,18 +35,19 @@ var privateHelpers = {
     };
     this.onNetworkChange = function(changes) {
       assertEq([network], changes);
-      chrome.networkingPrivate.getProperties(network,
-                                             collectProperties.bind(undefined));
+      chrome.networkingPrivate.getProperties(
+          network,
+          callbackPass(collectProperties));
     };
     chrome.networkingPrivate.onNetworksChanged.addListener(
-      this.onNetworkChange);
+        this.onNetworkChange);
   },
   listListener: function(network, expected, done) {
     var self = this;
     this.listenForChanges = function(list) {
       assertEq(expected, list);
       chrome.networkingPrivate.onNetworkListChanged.removeListener(
-        self.listenForChanges);
+          self.listenForChanges);
       done();
     };
   }
@@ -78,7 +79,6 @@ var availableTests = [
     chrome.networkingPrivate.getVisibleNetworks(
       "All",
       callbackPass(function(result) {
-        assertTrue(!!result);
         assertEq([{
                     "ConnectionState": "Connected",
                     "GUID": "stub_ethernet",
@@ -109,6 +109,7 @@ var availableTests = [
                   },
                   {
                     "Cellular": {
+                      "ActivateOverNonCellularNetwork": false,
                       "ActivationState": "not-activated",
                       "NetworkTechnology": "GSM",
                       "RoamingState": "home"
@@ -133,7 +134,6 @@ var availableTests = [
     chrome.networkingPrivate.getVisibleNetworks(
       "WiFi",
       callbackPass(function(result) {
-        assertTrue(!!result);
         assertEq([{
                     "ConnectionState": "Connected",
                     "GUID": "stub_wifi1",
@@ -163,7 +163,6 @@ var availableTests = [
     chrome.networkingPrivate.getProperties(
       "stub_wifi2",
       callbackPass(function(result) {
-        assertTrue(!!result);
         assertEq({
                    "ConnectionState": "NotConnected",
                    "GUID": "stub_wifi2",
@@ -177,22 +176,70 @@ var availableTests = [
                  }, result);
       }));
   },
+  function getManagedProperties() {
+    chrome.networkingPrivate.getManagedProperties(
+      "stub_wifi2",
+      callbackPass(function(result) {
+        assertEq({
+                   "ConnectionState": {
+                     "Active": "NotConnected",
+                     "Effective": "Unmanaged"
+                   },
+                   "GUID": "stub_wifi2",
+                   "Name": {
+                     "Active": "wifi2_PSK",
+                     "Effective": "UserPolicy",
+                     "UserPolicy": "My WiFi Network"
+                   },
+                   "Type": {
+                     "Active": "WiFi",
+                     "Effective": "UserPolicy",
+                     "UserPolicy": "WiFi"
+                   },
+                   "WiFi": {
+                     "AutoConnect": {
+                       "Active": false,
+                       "UserEditable": true
+                     },
+                     "Passphrase": {
+                       "Effective": "UserSetting",
+                       "UserEditable": true,
+                       "UserSetting": "FAKE_CREDENTIAL"
+                     },
+                     "SSID": {
+                       "Active": "stub_wifi2",
+                       "Effective": "UserPolicy",
+                       "UserPolicy": "stub_wifi2"
+                     },
+                     "Security": {
+                       "Active": "WPA-PSK",
+                       "Effective": "UserPolicy",
+                       "UserPolicy": "WPA-PSK"
+                     },
+                     "SignalStrength": {
+                       "Active": 80,
+                       "Effective": "Unmanaged"
+                     }
+                   }
+                 }, result);
+      }));
+  },
   function setProperties() {
     var done = chrome.test.callbackAdded();
     chrome.networkingPrivate.getProperties(
       "stub_wifi2",
-      function(result) {
+      callbackPass(function(result) {
         result.WiFi.Security = "WEP-PSK";
         chrome.networkingPrivate.setProperties("stub_wifi2", result,
-          function() {
+          callbackPass(function() {
             chrome.networkingPrivate.getProperties(
               "stub_wifi2",
-              function(result) {
+              callbackPass(function(result) {
                 assertEq("WEP-PSK", result.WiFi.Security);
                 done();
-              });
-          });
-      });
+              }));
+          }));
+      }));
   },
   function getState() {
     chrome.networkingPrivate.getState(
@@ -200,7 +247,7 @@ var availableTests = [
       callbackPass(function(result) {
         assertEq({
           "ConnectionState": "NotConnected",
-          "GUID": "",
+          "GUID": "stub_wifi2",
           "Name": "wifi2_PSK",
           "Type": "WiFi",
           "WiFi": {