Use GUID instead of ServicePath in networkingPrivate API

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 "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_profile_handler.h"
@@ skipping 112 matching lines @@
   return false;
 }
 
 bool NetworkState::InitialPropertiesReceived(
     const base::DictionaryValue& properties) {
   NET_LOG_DEBUG("InitialPropertiesReceived", path());
   bool changed = false;
   if (!properties.HasKey(shill::kTypeProperty)) {
     NET_LOG_ERROR("NetworkState has no type",
                   shill_property_util::GetNetworkIdFromProperties(properties));
-  } else {
-    changed |= UpdateName(properties);
+    return false;
   }
+  // Ensure that the network has a valid name.
+  changed |= UpdateName(properties);
+
+  // Set the ca_cert_nss_ property.
   bool had_ca_cert_nss = has_ca_cert_nss_;
   has_ca_cert_nss_ = IsCaCertNssSet(properties);
   changed |= had_ca_cert_nss != has_ca_cert_nss_;
+
+  // By convention, all visible WiFi networks have a SignalStrength > 0.

[pneubeck (no reviews), 2014/05/08 13:25:12]

unrelated?

[stevenjb, 2014/05/08 22:32:26]

Yeah, I guess it is. I added this while working on
networkingPrivate.getNetworks, I'll save it for that CL.

+  if (type() == shill::kTypeWifi) {
+    if (signal_strength_ <= 0)
+      signal_strength_ = 1;
+  }
+
   return changed;
 }
 
 void NetworkState::GetStateProperties(base::DictionaryValue* dictionary) const {
   ManagedState::GetStateProperties(dictionary);
 
   // Properties shared by all types.
   dictionary->SetStringWithoutPathExpansion(shill::kGuidProperty, guid());
   dictionary->SetStringWithoutPathExpansion(shill::kStateProperty,
                                             connection_state());
@@ skipping 96 matching lines @@
       result += ",";
     result += dns_servers_[i];
   }
   return result;
 }
 
 std::string NetworkState::GetNetmask() const {
   return network_util::PrefixLengthToNetmask(prefix_length_);
 }
 
+void NetworkState::SetGuid(const std::string& guid) {
+  guid_ = guid;
+}
+
 bool NetworkState::UpdateName(const base::DictionaryValue& properties) {
   std::string updated_name =
       shill_property_util::GetNameFromProperties(path(), properties);
   if (updated_name != name()) {
     set_name(updated_name);
     return true;
   }
   return false;
 }
 
@@ skipping 11 matching lines @@
           connection_state == shill::kStateCarrier);
 }
 
 // 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