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

chromeos/network/onc/onc_signature.cc

 // Copyright (c) 2012 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.
 
 #include "chromeos/network/onc/onc_signature.h"
 
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 245 matching lines @@
 const OncFieldSignature sim_lock_status_fields[] = {
     {::onc::sim_lock_status::kLockEnabled, &kBoolSignature},
     {::onc::sim_lock_status::kLockType, &kStringSignature},
     {::onc::sim_lock_status::kRetriesLeft, &kDoubleSignature},
     {NULL}};
 
 const OncFieldSignature cellular_fields[] = {
     {::onc::kRecommended, &kRecommendedSignature},
     {::onc::cellular::kAPN, &kCellularApnSignature},
     {::onc::cellular::kAPNList, &kCellularApnListSignature},
-    {::onc::vpn::kAutoConnect, &kBoolSignature},
+    {::onc::cellular::kCarrier, &kStringSignature},
+    {::onc::cellular::kAutoConnect, &kBoolSignature},

[pneubeck (no reviews), 2015/03/27 18:26:46]

please also fix all usages, e.g.:
https://code.google.com/p/chromium/codesearch#chromium/src/chromeos/network/o...

(probably the only one)

[stevenjb, 2015/03/27 23:18:04]

Done.

     {NULL}};
 
 const OncFieldSignature cellular_with_state_fields[] = {
     {::onc::cellular::kActivationType, &kStringSignature},
     {::onc::cellular::kActivationState, &kStringSignature},
     {::onc::cellular::kAllowRoaming, &kBoolSignature},
-    {::onc::cellular::kCarrier, &kStringSignature},
     {::onc::cellular::kESN, &kStringSignature},
     {::onc::cellular::kFamily, &kStringSignature},
     {::onc::cellular::kFirmwareRevision, &kStringSignature},
     {::onc::cellular::kFoundNetworks, &kCellularFoundNetworkListSignature},
     {::onc::cellular::kHardwareRevision, &kStringSignature},
     {::onc::cellular::kHomeProvider, &kCellularProviderSignature},
     {::onc::cellular::kICCID, &kStringSignature},
     {::onc::cellular::kIMEI, &kStringSignature},
     {::onc::cellular::kIMSI, &kStringSignature},
     {::onc::cellular::kLastGoodAPN, &kCellularApnSignature},
@@ skipping 243 matching lines @@
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos