Enable auto update over cellular when roaming is on by default

chrome/browser/ui/webui/help/help_utils_chromeos.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/ui/webui/help/help_utils_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/grit/generated_resources.h"
+#include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 const bool kDefaultUpdateOverCellularAllowed = false;
 
 }  // namespace
 
 namespace help_utils_chromeos {
 
 bool IsUpdateOverCellularAllowed() {
+  // Devices with a hard-coded policy to allow cellular roaming implicitly also
+  // allow updates over cellular; see http://crbug.com/640721.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+        chromeos::switches::kAllowDataRoamingByDefault))
+    return true;
+
   chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
   if (!settings)
     return kDefaultUpdateOverCellularAllowed;
 
   const base::Value* raw_types_value =
       settings->GetPref(chromeos::kAllowedConnectionTypesForUpdate);
   if (!raw_types_value)
     return kDefaultUpdateOverCellularAllowed;
   const base::ListValue* types_value;
   CHECK(raw_types_value->GetAsList(&types_value));
@@ skipping 20 matching lines @@
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_BLUETOOTH);
   if (type == shill::kTypeCellular)
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_CELLULAR);
   if (type == shill::kTypeVPN)
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN);
   NOTREACHED();
   return base::string16();
 }
 
 }  // namespace help_utils_chromeos