Treat tethered networks as mobile networks

chrome/browser/ui/webui/help/version_updater_chromeos.cc

 // Copyright (c) 2012 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/version_updater_chromeos.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 37 matching lines @@
 const bool kDefaultAutoUpdateDisabled = false;
 
 NetworkStatus GetNetworkStatus(bool interactive,
                                const chromeos::NetworkState* network) {
   if (!network || !network->IsConnectedState())  // Offline state.
     return NETWORK_STATUS_OFFLINE;
 
   if (network->type() == shill::kTypeBluetooth)
     return NETWORK_STATUS_DISALLOWED;
 
-  if (network->type() == shill::kTypeCellular &&
+  // Treats tethered networks as cellular networks.
+  if ((network->type() == shill::kTypeCellular ||
+       network->tethering_state() == shill::kTetheringConfirmedState) &&
       !help_utils_chromeos::IsUpdateOverCellularAllowed(interactive)) {
     return NETWORK_STATUS_DISALLOWED;
   }
   return NETWORK_STATUS_ALLOWED;
 }
 
 // Returns true if auto-update is disabled by the system administrator.
 bool IsAutoUpdateDisabled() {
   bool update_disabled = kDefaultAutoUpdateDisabled;
   chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
@@ skipping 23 matching lines @@
       network_state_handler->DefaultNetwork();
 
   // Don't allow an update if we're currently offline or connected
   // to a network for which updates are disallowed.
   NetworkStatus status = GetNetworkStatus(interactive, network);
   if (status == NETWORK_STATUS_OFFLINE) {
     callback.Run(VersionUpdater::FAILED_OFFLINE, 0, std::string(), 0,
                  l10n_util::GetStringUTF16(IDS_UPGRADE_OFFLINE));
     return false;
   } else if (status == NETWORK_STATUS_DISALLOWED) {
-    base::string16 message =
-        l10n_util::GetStringFUTF16(
-            IDS_UPGRADE_DISALLOWED,
-            help_utils_chromeos::GetConnectionTypeAsUTF16(network->type()));
+    base::string16 message = l10n_util::GetStringFUTF16(
+        IDS_UPGRADE_DISALLOWED,
+        help_utils_chromeos::GetConnectionTypeAsUTF16(
+            network->tethering_state() == shill::kTetheringConfirmedState
+                ? shill::kTypeCellular
+                : network->type()));
     callback.Run(VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED, 0,
                  std::string(), 0, message);
     return false;
   }
 
   return true;
 }
 
 }  // namespace
 
@@ skipping 192 matching lines @@
   }
 }
 
 void VersionUpdaterCros::OnUpdateCheck(
     UpdateEngineClient::UpdateCheckResult result) {
   // If version updating is not implemented, this binary is the most up-to-date
   // possible with respect to automatic updating.
   if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED)
     callback_.Run(UPDATED, 0, std::string(), 0, base::string16());
 }