Treat tethered networks as mobile networks

chrome/browser/ui/webui/settings/about_handler.cc

 // Copyright 2016 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/settings/about_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 85 matching lines @@
   const std::string label_text;
   const std::string image_url;
 };
 
 // Returns message that informs user that for update it's better to
 // connect to a network of one of the allowed types.
 base::string16 GetAllowedConnectionTypesMessage() {
   const chromeos::NetworkState* network = chromeos::NetworkHandler::Get()
                                               ->network_state_handler()
                                               ->DefaultNetwork();
-  const bool cellular = network && network->IsConnectedState() &&
-                        network->type() == shill::kTypeCellular;
+  const bool cellular =

[stevenjb, 2017/06/01 20:03:00]

nit: we should rename this mobile_data. (We can leave the IDS strings as they
are, but this one is easy to change and makes the code more clear).

[weidongg, 2017/06/01 20:41:00]

Done.

+      network && network->IsConnectedState() && network->IsUsingMobileData();
 
   if (help_utils_chromeos::IsUpdateOverCellularAllowed(
           true /* interactive */)) {
     return cellular
                ? l10n_util::GetStringUTF16(
                      IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED_NOT_AUTOMATIC)
                : l10n_util::GetStringUTF16(
                      IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED);
   } else {
     return l10n_util::GetStringUTF16(
@@ skipping 568 matching lines @@
       label_dir_path.AppendASCII(kRegulatoryLabelImageFilename).MaybeAsASCII();
   std::string url =
       std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path;
   regulatory_info->SetString("url", url);
 
   ResolveJavascriptCallback(base::Value(callback_id), *regulatory_info);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace settings