Appropriate handling for Cellular First devices.

chrome/browser/chromeos/policy/device_network_configuration_updater.cc

Index: chrome/browser/chromeos/policy/device_network_configuration_updater.cc
diff --git a/chrome/browser/chromeos/policy/device_network_configuration_updater.cc b/chrome/browser/chromeos/policy/device_network_configuration_updater.cc
index 301a0749a6fb9c06b92adfbf41a49b5f9b3aba2a..6bc15d75030db369c70d310a569d5f29af120942 100644
--- a/chrome/browser/chromeos/policy/device_network_configuration_updater.cc
+++ b/chrome/browser/chromeos/policy/device_network_configuration_updater.cc
@@ -59,14 +59,10 @@ DeviceNetworkConfigurationUpdater::DeviceNetworkConfigurationUpdater(
 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();
-  if (!connector->IsEnterpriseManaged() &&
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kAllowDataRoamingByDefault)) {
+  // If this is a Cellular First device, then cellular data roaming
+  // should be allowed by default.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kCellularFirst)) {

[xiyuan, 2017/02/28 20:26:41]

What would be the expected behavior if policy says no data roaming but we have
the switch? If the switch should win, then we probably should move the logic
into OnDataRoamingSettingChanged() to ignore policy value. If policy should win,
we should keep the !IsEnterpriseManaged() test here.

[kumarniranjan, 2017/02/28 21:49:34]

Policy should win, so I kept the !IsEnterpriseManaged() test

     network_device_handler_->SetCellularAllowRoaming(true);
   } else {
     // Apply the roaming setting initially.
@@ -74,6 +70,8 @@ void DeviceNetworkConfigurationUpdater::Init() {
   }
 
   // Set up MAC address randomization if we are not enterprise managed.
+  const policy::BrowserPolicyConnectorChromeOS* connector =
+      g_browser_process->platform_part()->browser_policy_connector_chromeos();
   network_device_handler_->SetMACAddressRandomizationEnabled(
       !connector->IsEnterpriseManaged());
 }