Use GUID instead of ServicePath in networkingPrivate API

chromeos/network/favorite_state.cc

 // Copyright 2013 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/favorite_state.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/network/network_event_log.h"
@@ skipping 45 matching lines @@
     if (proxy_config_dict) {
       // Warning: The DictionaryValue returned from
       // ReadDictionaryFromJson/JSONParser is an optimized derived class that
       // doesn't allow releasing ownership of nested values. A Swap in the wrong
       // order leads to memory access errors.
       proxy_config_.MergeDictionary(proxy_config_dict.get());
     } else {
       NET_LOG_ERROR("Failed to parse " + key, path());
     }
     return true;
+  } else if (key == shill::kSecurityProperty) {
+    // Only used for GetSpecifier()
+    return GetStringValue(key, value, &security_);
   }
   return false;
 }
 
 void FavoriteState::GetStateProperties(
     base::DictionaryValue* dictionary) const {
   ManagedState::GetStateProperties(dictionary);
 
   dictionary->SetStringWithoutPathExpansion(shill::kGuidProperty, guid());
   dictionary->SetStringWithoutPathExpansion(shill::kProfileProperty,
                                             profile_path());
   // Add ONCSource for debugging.
   dictionary->SetStringWithoutPathExpansion(NetworkUIData::kKeyONCSource,
                                             ui_data_.GetONCSourceAsString());
 }
 
-bool FavoriteState::IsFavorite() const {
-  // kTypeEthernetEap is always a favorite. We need this check because it does
+std::string FavoriteState::GetSpecifier() const {
+  if (type() == shill::kTypeWifi)
+    return name() + "_" + security_;
+  if (!name().empty())
+    return name();
+  return type();  // For unnamed networks such as ethernet.
+}
+
+void FavoriteState::SetGuid(const std::string& guid) {
+  DCHECK(guid_.empty());
+  guid_ = guid;
+}
+
+bool FavoriteState::IsInProfile() const {
+  // kTypeEthernetEap is always saved. We need this check because it does
   // not show up in the visible list, but its properties may not be available
   // when it first shows up in ServiceCompleteList. See crbug.com/355117.
   return !profile_path_.empty() || type() == shill::kTypeEthernetEap;
 }
 
 bool FavoriteState::IsPrivate() const {
   return !profile_path_.empty() &&
       profile_path_ != NetworkProfileHandler::GetSharedProfilePath();
 }
 
 }  // namespace chromeos