Use GUID instead of ServicePath in networkingPrivate API

chromeos/network/shill_property_handler.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/shill_property_handler.h"
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ skipping 335 matching lines @@
   std::set<std::string> new_requested_updates;
   NET_LOG_DEBUG(
       base::StringPrintf("UpdateProperties: %" PRIuS, entries.GetSize()),
       ManagedState::TypeToString(type));
   for (base::ListValue::const_iterator iter = entries.begin();
        iter != entries.end(); ++iter) {
     std::string path;
     (*iter)->GetAsString(&path);
     if (path.empty())
       continue;
+    // Only request properties once. Favorites that are visible will be updated
+    // when the Network entry is updated. Since 'Services' is always processed
+    // before ServiceCompleteList, only Favorites that are not visible will be
+    // requested here, and GetPropertiesCallback() will only get called with
+    // type == FAVORITE for non-visible Favorites.
     if (type == ManagedState::MANAGED_TYPE_FAVORITE &&
-        requested_service_updates.count(path) > 0)
-      continue;  // Update already requested
+        requested_service_updates.count(path) > 0) {
+      continue;
+    }
 
     // We add a special case for devices here to work around an issue in shill
     // that prevents it from sending property changed signals for cellular
     // devices (see crbug.com/321854).
     if (type == ManagedState::MANAGED_TYPE_DEVICE ||
         requested_updates.find(path) == requested_updates.end())
       RequestProperties(type, path);
     new_requested_updates.insert(path);
   }
   requested_updates.swap(new_requested_updates);
@@ skipping 101 matching lines @@
   NET_LOG_DEBUG("GetPropertiesCallback: " + ManagedState::TypeToString(type),
                 path);
   pending_updates_[type].erase(path);
   if (call_status != DBUS_METHOD_CALL_SUCCESS) {
     // The shill service no longer exists.  This can happen when a network
     // has been removed.
     NET_LOG_DEBUG("Failed to get properties",
                   base::StringPrintf("%s: %d", path.c_str(), call_status));
     return;
   }
-  // Update Favorite properties for networks in the Services list.
+  // Update Favorite properties for networks in the Services list. Call this
+  // for all networks, regardless of whether or not Profile is set, because
+  // we track all networks in the Favorites list (even if they aren't saved
+  // in a Profile). See notes in UpdateProperties() and favorite_state.h.
   if (type == ManagedState::MANAGED_TYPE_NETWORK) {
-    // Only networks with a ProfilePath set are Favorites.
-    std::string profile_path;
-    properties.GetStringWithoutPathExpansion(
-        shill::kProfileProperty, &profile_path);
-    if (!profile_path.empty()) {
-      listener_->UpdateManagedStateProperties(
-          ManagedState::MANAGED_TYPE_FAVORITE, path, properties);
-    }
+    listener_->UpdateManagedStateProperties(
+        ManagedState::MANAGED_TYPE_FAVORITE, path, properties);
   }
   listener_->UpdateManagedStateProperties(type, path, properties);
 
   if (type == ManagedState::MANAGED_TYPE_NETWORK) {
     // Request IPConfig properties.
     const base::Value* value;
     if (properties.GetWithoutPathExpansion(shill::kIPConfigProperty, &value))
       RequestIPConfig(type, path, *value);
   } else if (type == ManagedState::MANAGED_TYPE_DEVICE) {
     // Clear and request IPConfig properties for each entry in IPConfigs.
@@ skipping 74 matching lines @@
     NET_LOG_ERROR("Failed to get IP Config properties",
                   base::StringPrintf("%s: %d", path.c_str(), call_status));
     return;
   }
   NET_LOG_EVENT("IP Config properties received", path);
   listener_->UpdateIPConfigProperties(type, path, ip_config_path, properties);
 }
 
 }  // namespace internal
 }  // namespace chromeos