[CrOS Tether] Update NetworkState to include tether properties and integrate into NetworkStateHandl…

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>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "chromeos/network/managed_state.h"
 #include "components/onc/onc_constants.h"
 #include "url/gurl.h"
 
 namespace base {
 class DictionaryValue;
 class Value;
 }
@@ skipping 49 matching lines @@
   // so cache them to avoid excessively complex client code.
   const std::string& ip_address() const { return ip_address_; }
   const std::string& gateway() const { return gateway_; }
   const std::vector<std::string>& dns_servers() const { return dns_servers_; }
   const GURL& web_proxy_auto_discovery_url() const {
     return web_proxy_auto_discovery_url_;
   }
 
   // Wireless property accessors
   bool connectable() const { return connectable_; }
+  // For Shill nletwork types, the connectable property is set via an update

[stevenjb, 2017/04/19 17:34:17]

network

[Kyle Horimoto, 2017/04/19 19:23:29]

Done.

+  // from Shill, so SetTetherNetworkConnectable() should not be called in those
+  // cases. For tether networks, the network is connectable by default, so this
+  // function should be called when the network is created.
+  void SetTetherNetworkConnectable();

[stevenjb, 2017/04/19 17:34:17]

Generally keep complex methods separate from trivial getters and setters. Also,
blank line before function comments.

That said, just make this a regular setter. No need for this to be special for
tether networks, and no need for the detailed explanation here, that's all
tether specific implementation details:

void set_connectable(bool connectable) { connectable_ = connectable; }

[Kyle Horimoto, 2017/04/19 19:23:29]

Done.

   bool is_captive_portal() const { return is_captive_portal_; }
   int signal_strength() const { return signal_strength_; }
+  // For Wi-Fi, WiMAX, and cellular networks, signal strength is set via updates
+  // from Shill, so SetTetherSignalStrength() should not be called in those
+  // cases. For tether networks, the signal strength is received as a message
+  // from the tether host over Bluetooth, so it must be set via
+  // SetTetherSignalStrength() since it does not come from Shill.
+  void SetTetherSignalStrength(int signal_strength);

[stevenjb, 2017/04/19 17:34:17]

ditto

[Kyle Horimoto, 2017/04/19 19:23:29]

Done.

 
   // Wifi property accessors
   const std::string& eap_method() const { return eap_method_; }
   const std::vector<uint8_t>& raw_ssid() const { return raw_ssid_; }
 
   // Cellular property accessors
   const std::string& network_technology() const {
     return network_technology_;
   }
   const std::string& activation_type() const { return activation_type_; }
   const std::string& activation_state() const { return activation_state_; }
   const std::string& roaming() const { return roaming_; }
   const std::string& payment_url() const { return payment_url_; }
   bool cellular_out_of_credits() const { return cellular_out_of_credits_; }
 
   // VPN property accessors
   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 SetBatteryPercentage(int battery_percentage);

[stevenjb, 2017/04/19 17:34:17]

inline, set_battery_percentage()

[Kyle Horimoto, 2017/04/19 19:23:29]

Done.

+  const std::string& carrier() const { return carrier_; }
+  void SetCarrier(const std::string& carrier);

[stevenjb, 2017/04/19 17:34:17]

inline

[Kyle Horimoto, 2017/04/19 19:23:29]

Done.

   const std::string& tether_guid() const { return tether_guid_; }
   void set_tether_guid(const std::string& guid) { tether_guid_ = guid; }
 
   // Returns true if the network securty is WEP_8021x (Dynamic WEP)
   bool IsDynamicWep() const;
 
   // Returns true if |connection_state_| is a connected/connecting state.
   bool IsConnectedState() const;
   bool IsConnectingState() const;
 
@@ skipping 31 matching lines @@
   static bool StateIsConnected(const std::string& connection_state);
   static bool StateIsConnecting(const std::string& connection_state);
   static bool NetworkStateIsCaptivePortal(
       const base::DictionaryValue& shill_properties);
   static bool ErrorIsValid(const std::string& error);
 
  private:
   friend class MobileActivatorTest;
   friend class NetworkStateHandler;
   friend class NetworkChangeNotifierChromeosUpdateTest;
+  FRIEND_TEST_ALL_PREFIXES(NetworkStateTest, TetherProperties);
 
   // Updates |name_| from WiFi.HexSSID if provided, and validates |name_|.
   // Returns true if |name_| changes.
   bool UpdateName(const base::DictionaryValue& properties);
 
   // Set to true if the network is a member of Manager.Services.
   bool visible_ = false;
 
   // Network Service properties. Avoid adding any additional properties here.
   // Instead use NetworkConfigurationHandler::GetProperties() to asynchronously
@@ skipping 40 matching lines @@
   std::string activation_state_;
   std::string roaming_;
   std::string payment_url_;
   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_;
+
   // 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_