Appropriate handling for Cellular First devices.

chrome/browser/chromeos/policy/device_network_configuration_updater.cc

 // Copyright 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.
 
 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 41 matching lines @@
   data_roaming_setting_subscription_ = cros_settings->AddSettingsObserver(
       chromeos::kSignedDataRoamingEnabled,
       base::Bind(
           &DeviceNetworkConfigurationUpdater::OnDataRoamingSettingChanged,
           base::Unretained(this)));
 }
 
 void DeviceNetworkConfigurationUpdater::Init() {
   NetworkConfigurationUpdater::Init();
 
-  // TODO(xdai): kAllowDataRoamingByDefault is only used by Rialto devices for
-  // development/testing purpose. After Rialto migrates to use KIOSK app mode,
-  // remove this part of logic.
   const policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
+
+  // The highest authority regarding whether cellular data roaming should be
+  // allowed is the Device Policy. If there is no Device Policy, then
+  // data roaming should be allowed if this is a Cellular First device.
   if (!connector->IsEnterpriseManaged() &&
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kAllowDataRoamingByDefault)) {
+      chromeos::switches::IsCellularFirstDevice()) {
     network_device_handler_->SetCellularAllowRoaming(true);
   } else {
     // Apply the roaming setting initially.
     OnDataRoamingSettingChanged();
   }
 
   // Set up MAC address randomization if we are not enterprise managed.
+
   network_device_handler_->SetMACAddressRandomizationEnabled(
       !connector->IsEnterpriseManaged());
 }
 
 void DeviceNetworkConfigurationUpdater::ImportCertificates(
     const base::ListValue& certificates_onc) {
   // Importing CA and server certs from device policy is not  allowed, while
   // importing client is not yet supported (as a system-wide PKCS#11 token to
   // which they should be imported does not exists at the time).
 }
@@ skipping 30 matching lines @@
   } else {
     DCHECK_EQ(trusted_status,
               chromeos::CrosSettingsProvider::PERMANENTLY_UNTRUSTED);
     // Roaming is disabled as we can't determine the correct setting.
   }
 
   network_device_handler_->SetCellularAllowRoaming(data_roaming_setting);
 }
 
 }  // namespace policy