This moves the ONC parsing code into chromeos/network/onc

chromeos/network/network_event_log.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_EVENT_LOG_H_
 #define CHROMEOS_NETWORK_NETWORK_EVENT_LOG_H_
 
 #include <deque>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/stringprintf.h"
 #include "base/time.h"
 #include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 
 // Namespace for functions for logging network events.
 namespace network_event_log {
 
 // Used to determine which order to output event entries in GetAsString.
 enum StringOrder {
@@ skipping 16 matching lines @@
 // after which new events replace old ones. Does nothing unless Initialize()
 // has been called.
 CHROMEOS_EXPORT void AddEntry(const std::string& module,
                               const std::string& event,
                               const std::string& description);
 
 // Outputs the log to a formatted string. |order| determines which order to
 // output the events. If |max_events| > 0, limits how many events are output.
 CHROMEOS_EXPORT std::string GetAsString(StringOrder order, size_t max_events);
 
+// Macros to make logging format more consistent.
+#define NET_LOG(message)                                                     \
+    ::chromeos::network_event_log::AddEntry(                                 \
+        std::string(__FILE__) + ":" + ::base::StringPrintf("%d",__LINE__),   \

[pneubeck (no reviews), 2012/12/10 09:33:10]

that seems rather fine-grained. maybe better:
module: __FILE__
event: __LINE__ + __FUNC__

StringPrintf instead of concatentation: "%s %d", FUNC, LINE

[stevenjb, 2012/12/10 20:46:51]

Agreed (although I'd do __FUNC__:__LINE__). I expect we'll want to add
per-module filtering to network_event_log::GetString; filtering by file seems
more useful than by file + line number.

[Greg Spencer (Chromium), 2012/12/10 23:54:03]

What about if I just combine all of them for the "event", (something like file +
":" + line_number + " (" + function + ")") and pass in a "module" so that we can
use "ONC" for the module, and the event includes all the specifics about which
file, etc.  I'm thinking about both of your comments about showing
warnings/errors during import by just showing the log info.

If we had a way to filter all the output from a particular system (like "ONC"),
then it would be easier to display the log entries for it.  Otherwise, we'll
have to keep updating a list of files that need to be displayed on the ONC
import page.

+        std::string(__func__),                                               \
+        message)
+
+#define NET_LOG_WARNING(message)                                            \
+    NET_LOG(std::string("WARNING:") + message)
+#define NET_LOG_ERROR(message)                                              \
+    NET_LOG(std::string("ERROR:") + message)
+
 }  // namespace network_event_log
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_EVENT_LOG_H_