Treat tethered networks as mobile networks

chromeos/network/network_state.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 94 matching lines @@
   const std::string& vpn_provider_type() const { return vpn_provider_type_; }
   const std::string& third_party_vpn_provider_extension_id() const {
     return third_party_vpn_provider_extension_id_;
   }
 
   // Tether accessors and setters.
   int battery_percentage() const { return battery_percentage_; }
   void set_battery_percentage(int battery_percentage) {
     battery_percentage_ = battery_percentage;
   }
+  const std::string& tethering_state() const { return tethering_state_; }
+  void set_tethering_state(std::string tethering_state) {
+    tethering_state_ = tethering_state;
+  }

[stevenjb, 2017/06/01 16:03:36]

1. We shouldn't need a setter for this.
2. "tethering" is a bit different from type=Tether networks, so let's move
tethering_state() under the 'Cellular property accessors' section.
3. Since (for now anyway) we are always checking for "type==Cellular or
tethering==confirmed", instead of thethering_state() let's add a method here
"IsUsingMobileData()" which has that logic so that it is in one place.
4. We also want to add "type==Tether" to the IsUsingMobileData() method (another
good reason to put the logic in one place).

[weidongg, 2017/06/01 18:14:29]

Aha, that's much cleaner. Thanks. BTW, does it mean that when 'Magic Tether' is
implemented, we could get 'type==Tether' instead of 'tethering==confirmed'?

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

They are different things. You can still connect to a phone hotspot without
using Magic Tether.

   const std::string& carrier() const { return carrier_; }
   void set_carrier(const std::string& carrier) { carrier_ = carrier; }
   bool tether_has_connected_to_host() const {
     return tether_has_connected_to_host_;
   }
   void set_tether_has_connected_to_host(bool tether_has_connected_to_host) {
     tether_has_connected_to_host_ = tether_has_connected_to_host;
   }
   const std::string& tether_guid() const { return tether_guid_; }
   void set_tether_guid(const std::string& guid) { tether_guid_ = guid; }
@@ skipping 103 matching lines @@
   bool cellular_out_of_credits_ = false;
 
   // VPN properties, used to construct the display name and to show the correct
   // configuration dialog.
   std::string vpn_provider_type_;
   std::string third_party_vpn_provider_extension_id_;
 
   // Tether properties.
   std::string carrier_;
   int battery_percentage_;
+  std::string tethering_state_;

[stevenjb, 2017/06/01 16:03:36]

Blank line here (but also move this after line 232)

[weidongg, 2017/06/01 18:14:29]

Done.

   // Whether the current device has already connected to the tether host device
   // providing the hotspot corresponding to this NetworkState.
   // Note: this means that the current device has already connected to the
   // tether host, but it does not necessarily mean that the current device has
   // connected to the Tether network corresponding to this NetworkState.
   bool tether_has_connected_to_host_;
 
   // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler
   // provides proxy configuration. crbug.com/241775
   base::DictionaryValue proxy_config_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_H_