Call Device.SetCarrier when the ONC Carrier property is specified.

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;
@@ skipping 443 matching lines @@
             Security: {
               Active: 'WPA-PSK',
               Effective: 'UserPolicy',
               UserPolicy: 'WPA-PSK'
             },
             SignalStrength: 80,
           }
         }, result);
       }));
   },
+  function setCellularProperties() {
+    var network_guid = 'stub_cellular1_guid';
+    // Make sure we test Cellular.Carrier since it requires a special call
+    // to Shill.Device.SetCarrier.
+    var newCarrier = 'new_carrier';
+    chrome.networkingPrivate.getProperties(
+        network_guid,
+        callbackPass(function(result) {
+          assertEq(network_guid, result.GUID);
+          assertTrue(!result.Cellular || result.Cellular.Carrier != newCarrier);
+          var new_properties = {
+            Priority: 1,
+            Cellular: {
+              Carrier: newCarrier,
+            },
+          };
+          chrome.networkingPrivate.setProperties(
+              network_guid,
+              new_properties,
+              callbackPass(function() {
+                chrome.networkingPrivate.getProperties(
+                    network_guid,
+                    callbackPass(function(result) {
+                      // Ensure that the GUID doesn't change.
+                      assertEq(network_guid, result.GUID);
+                      // Ensure that the properties were set.
+                      assertEq(1, result['Priority']);
+                      assertTrue('Cellular' in result);
+                      assertEq(newCarrier, result.Cellular.Carrier);
+                    }));
+              }));
+        }));
+  },
   function setWiFiProperties() {
-    var done = chrome.test.callbackAdded();
     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
             },
@@ skipping 12 matching lines @@
                       // Ensure that the GUID doesn't change.
                       assertEq(network_guid, result.GUID);
                       // Ensure that the properties were set.
                       assertEq(1, result['Priority']);
                       assertTrue('WiFi' in result);
                       assertTrue('AutoConnect' in result['WiFi']);
                       assertEq(true, result['WiFi']['AutoConnect']);
                       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';
     chrome.networkingPrivate.getProperties(
         network_guid,
         callbackPass(function(result) {
           assertEq(network_guid, result.GUID);
           var new_properties = {
             Priority: 1,
             VPN: {
               Host: 'vpn.host1'
             }
           };
           chrome.networkingPrivate.setProperties(
               network_guid,
               new_properties,
               callbackPass(function() {
                 chrome.networkingPrivate.getProperties(
                     network_guid,
                     callbackPass(function(result) {
                       // Ensure that the properties were set.
                       assertEq(1, result['Priority']);
                       assertTrue('VPN' in result);
                       assertTrue('Host' in result['VPN']);
                       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',
       callbackPass(function(result) {
         assertEq({
           Connectable: true,
@@ skipping 104 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;
 }));