Treat tethered networks as mobile networks

chromeos/network/network_state.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 "chromeos/network/network_state.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 183 matching lines @@
               shill::kHostProperty, &third_party_vpn_provider_extension_id_)) {
         NET_LOG(ERROR) << "Failed to parse " << path() << "." << key;
         return false;
       }
     } else {
       third_party_vpn_provider_extension_id_.clear();
     }
 
     vpn_provider_type_ = vpn_provider_type;
     return true;
+  } else if (key == shill::kTetheringProperty) {
+    return GetStringValue(key, value, &tethering_state_);
   }
   return false;
 }
 
 bool NetworkState::InitialPropertiesReceived(
     const base::DictionaryValue& properties) {
   NET_LOG(EVENT) << "InitialPropertiesReceived: " << path() << ": " << name()
                  << " State: " << connection_state_ << " Visible: " << visible_;
   if (!properties.HasKey(shill::kTypeProperty)) {
     NET_LOG(ERROR) << "NetworkState has no type: "
@@ skipping 143 matching lines @@
   if (!visible())
     return shill::kStateDisconnect;
   return connection_state_;
 }
 
 void NetworkState::set_connection_state(const std::string connection_state) {
   last_connection_state_ = connection_state_;
   connection_state_ = connection_state;
 }
 
+bool NetworkState::IsUsingMobileData() const {
+  return type() == shill::kTypeCellular || type() == chromeos::kTypeTether ||
+         tethering_state() == shill::kTetheringConfirmedState;
+}
+
 bool NetworkState::IsDynamicWep() const {
   return security_class_ == shill::kSecurityWep &&
          eap_key_mgmt_ == shill::kKeyManagementIEEE8021X;
 }
 
 bool NetworkState::IsConnectedState() const {
   return visible() && StateIsConnected(connection_state_);
 }
 
 bool NetworkState::IsConnectingState() const {
@@ skipping 87 matching lines @@
   return IsCaptivePortalState(shill_properties, false /* log */);
 }
 
 // static
 bool NetworkState::ErrorIsValid(const std::string& error) {
   // Shill uses "Unknown" to indicate an unset or cleared error state.
   return !error.empty() && error != kErrorUnknown;
 }
 
 }  // namespace chromeos