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

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 "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/shill_property_util.h"
+#include "chromeos/network/tether_constants.h"
 #include "components/device_event_log/device_event_log.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace {
 
 const char kErrorUnknown[] = "Unknown";
 
 bool ConvertListValueToStringVector(const base::ListValue& string_list,
                                     std::vector<std::string>* result) {
   for (size_t i = 0; i < string_list.GetSize(); ++i) {
@@ skipping 257 matching lines @@
   if (NetworkTypePattern::Mobile().MatchesType(type())) {
     dictionary->SetStringWithoutPathExpansion(shill::kNetworkTechnologyProperty,
                                               network_technology());
     dictionary->SetStringWithoutPathExpansion(shill::kActivationStateProperty,
                                               activation_state());
     dictionary->SetStringWithoutPathExpansion(shill::kRoamingStateProperty,
                                               roaming());
     dictionary->SetBooleanWithoutPathExpansion(shill::kOutOfCreditsProperty,
                                                cellular_out_of_credits());
   }
+
+  // Tether properties
+  if (NetworkTypePattern::Tether().MatchesType(type())) {
+    DCHECK(battery_percentage() >= 0 && battery_percentage() <= 100);
+    DCHECK(!carrier().empty());
+    DCHECK(signal_strength() >= 0 && signal_strength() <= 100);

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

We generally shouldn't put DCHECK in getters. These should already be normalized
anyway, and this code doesn't really care about the ranges.

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

Done.

+    dictionary->SetIntegerWithoutPathExpansion(kTetherBatteryPercentage,
+                                               battery_percentage());
+    dictionary->SetStringWithoutPathExpansion(kTetherCarrier, carrier());
+    dictionary->SetIntegerWithoutPathExpansion(kTetherSignalStrength,
+                                               signal_strength());
+  }
 }
 
 void NetworkState::IPConfigPropertiesChanged(
     const base::DictionaryValue& properties) {
   for (base::DictionaryValue::Iterator iter(properties); !iter.IsAtEnd();
        iter.Advance()) {
     std::string key = iter.key();
     const base::Value& value = iter.value();
 
     if (key == shill::kAddressProperty) {
@@ skipping 38 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;
 }
 
+void NetworkState::SetTetherNetworkConnectable() {
+  DCHECK(kTypeTether == type());
+  connectable_ = true;
+}
+
+void NetworkState::SetTetherSignalStrength(int signal_strength) {
+  DCHECK(kTypeTether == type());
+  signal_strength_ = signal_strength;
+}
+
+void NetworkState::SetBatteryPercentage(int battery_percentage) {
+  DCHECK(kTypeTether == type());
+  battery_percentage_ = battery_percentage;
+}
+
+void NetworkState::SetCarrier(const std::string& carrier) {
+  DCHECK(kTypeTether == type());
+  carrier_ = carrier;
+}
+
 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