Cleanup network event logging, add to ManagedNetworkConfigurationHandler

chromeos/network/shill_property_util.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_
 #define CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 // Sets the |ssid| in |properties|.
 CHROMEOS_EXPORT void SetSSID(const std::string ssid,
                              base::DictionaryValue* properties);
 
 // Returns the SSID from |properties| in UTF-8 encoding. If |unknown_encoding|
 // is not NULL, it is set to whether the SSID is of unknown encoding.
 CHROMEOS_EXPORT std::string GetSSIDFromProperties(
     const base::DictionaryValue& properties,
     bool* unknown_encoding);
 
-// Returns the name for the network represented by the Shill |properties|. For
+// Returns the GUID (if available), SSID, or Name from |properties|. Only used
+// for logging and debugging.
+CHROMEOS_EXPORT std::string GetNetworkIdFromProperties(
+    const base::DictionaryValue& properties);
+
+  // Returns the name for the network represented by the Shill |properties|. For
 // WiFi it refers to the HexSSID.
 CHROMEOS_EXPORT std::string GetNameFromProperties(
     const std::string& service_path,
     const base::DictionaryValue& properties);
 
 // Returns the UIData specified by |value|. Returns NULL if the value cannot be
 // parsed.
 scoped_ptr<NetworkUIData> GetUIDataFromValue(const base::Value& value);
 
 // Returns the NetworkUIData parsed from the UIData property of
@@ skipping 68 matching lines @@
 
   // The bit array of the matching network types.
   int pattern_;
 
   DISALLOW_ASSIGN(NetworkTypePattern);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_