Appropriate handling for Cellular First devices.

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;

[xiyuan, 2017/02/14 17:06:10]

We can get rid of this now since the default can change based on whether we have
--celluar-first switch.

[kumarniranjan, 2017/02/28 19:01:39]

Done.

 
 }  // namespace
 
 namespace help_utils_chromeos {
 
 bool IsUpdateOverCellularAllowed() {
+  bool updateOverCellularAllowed = kDefaultUpdateOverCellularAllowed;

[xiyuan, 2017/02/14 17:06:10]

updateOverCellularAllowed -> default_update_over_cellular_allowed

[kumarniranjan, 2017/02/28 19:01:39]

Done.

+
+  // If this is a Cellular First device, allow updates over cellular.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kCellularFirst)) {
+    updateOverCellularAllowed = true;
+  }
+
+  // Device Policy overrides the defaults.
   chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
   if (!settings)
-    return kDefaultUpdateOverCellularAllowed;
+    return updateOverCellularAllowed;
 
   const base::Value* raw_types_value =
       settings->GetPref(chromeos::kAllowedConnectionTypesForUpdate);
   if (!raw_types_value)
-    return kDefaultUpdateOverCellularAllowed;
+    return updateOverCellularAllowed;
   const base::ListValue* types_value;
   CHECK(raw_types_value->GetAsList(&types_value));
   for (size_t i = 0; i < types_value->GetSize(); ++i) {
     int connection_type;
     if (!types_value->GetInteger(i, &connection_type)) {
       LOG(WARNING) << "Can't parse connection type #" << i;
       continue;
     }
     if (connection_type == 4)
       return true;
   }
-  return kDefaultUpdateOverCellularAllowed;
+  return updateOverCellularAllowed;
 }
 
 base::string16 GetConnectionTypeAsUTF16(const std::string& type) {
   if (chromeos::NetworkTypePattern::Ethernet().MatchesType(type))
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_ETHERNET);
   if (type == shill::kTypeWifi)
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIFI);
   if (type == shill::kTypeWimax)
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIMAX);
   if (type == shill::kTypeBluetooth)
     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