commit d6153617c6c7830a28e8c6545accc8c3184a5da1
author Wade Guthrie <wdg@chromium.org> Thu Aug 23 11:36:14 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Aug 24 16:09:37 2012 -0700
tree e83a91f5690e1980618203be04003324a0008fb0
parent 2ebc16da6068c8c61658b39cf70d157d7d0911eb

Shill: Wait until cfg80211/mac80211 are up before trying to configure.

BUG=chromium-os:33837
TEST=Updated unit tests.

Change-Id: I69711d0a3c366297b0568bca770dd50c2a44f722
Reviewed-on: https://gerrit.chromium.org/gerrit/31237
Commit-Ready: Wade Guthrie <wdg@chromium.org>
Reviewed-by: Wade Guthrie <wdg@chromium.org>
Tested-by: Wade Guthrie <wdg@chromium.org>

user_bound_nlmessage.cc

diff --git a/user_bound_nlmessage.cc b/user_bound_nlmessage.cc
index 9d40f27..ab4d406 100644
--- a/user_bound_nlmessage.cc
+++ b/user_bound_nlmessage.cc
@@ -1851,11 +1851,6 @@
     return NULL;
   }
 
-//#if 0  // If we're collecting data for unit tests, uncommnet this.
-  UserBoundNlMessageDataCollector::GetInstance()->CollectDebugData(*message,
-                                                                   msg);
-//#endif // 0
-
   return message.release();
 }
 
@@ -1897,20 +1892,20 @@
     doit = node->second;
 
   if (doit) {
-    LOG(ERROR) << "@@const unsigned char "
+    LOG(INFO) << "@@const unsigned char "
                << "k" << message.GetMessageTypeString()
-               << "[] = { ";
+               << "[] = {";
 
     int payload_bytes = nlmsg_len(msg);
 
     size_t bytes = nlmsg_total_size(payload_bytes);
     unsigned char *rawdata = reinterpret_cast<unsigned char *>(msg);
     for (size_t i=0; i<bytes; ++i) {
-      LOG(ERROR) << "  0x"
+      LOG(INFO) << "  0x"
                  << std::hex << std::setfill('0') << std::setw(2)
                  << + rawdata[i] << ",";
     }
-    LOG(ERROR) << "};";
+    LOG(INFO) << "};";
     need_to_print[message.GetMessageType()] = false;
   }
 }