commit fad4a0b7e55dd82d3815ee96862b6e546727eb6e
author Ben Chan <benchan@chromium.org> Wed Apr 18 15:49:59 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Apr 20 11:09:45 2012 -0700
tree 6d2622f8a07981d78eeaa89e8abed64ec063df0d
parent 3022be5da0e7e158c7f8fc4e3f5d005eb5dde7e7

shill: Replace VLOG with SLOG.

This CL replaces all uses of VLOG(level) with SLOG(scope, level) with
the same verbose level and an appropriate scope for each affected
logging statement.

BUG=chromium-os:29641
TEST=Build and run unit tests. Test scope logging with ff_debug.

Change-Id: Ifdcf1faa2a309bcbd9ee369a66179ce9c7f1ad19
Reviewed-on: https://gerrit.chromium.org/gerrit/20629
Commit-Ready: Ben Chan <benchan@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

modem_cdma_proxy.cc

diff --git a/modem_cdma_proxy.cc b/modem_cdma_proxy.cc
index 05e126e..c7eb597 100644
--- a/modem_cdma_proxy.cc
+++ b/modem_cdma_proxy.cc
@@ -7,6 +7,7 @@
 #include <base/logging.h>
 
 #include "shill/cellular_error.h"
+#include "shill/scope_logger.h"
 
 using std::string;
 
@@ -108,29 +109,30 @@
     const uint32 &activation_state,
     const uint32 &activation_error,
     const DBusPropertiesMap &status_changes) {
-  VLOG(2) << __func__ << "(" << activation_state << ", " << activation_error
-          << ")";
+  SLOG(Modem, 2) << __func__ << "(" << activation_state << ", "
+                 << activation_error << ")";
   activation_state_callback_.Run(activation_state,
                                   activation_error,
                                   status_changes);
 }
 
 void ModemCDMAProxy::Proxy::SignalQuality(const uint32 &quality) {
-  VLOG(2) << __func__ << "(" << quality << ")";
+  SLOG(Modem, 2) << __func__ << "(" << quality << ")";
   signal_quality_callback_.Run(quality);
 }
 
 void ModemCDMAProxy::Proxy::RegistrationStateChanged(
     const uint32 &cdma_1x_state,
     const uint32 &evdo_state) {
-  VLOG(2) << __func__ << "(" << cdma_1x_state << ", " << evdo_state << ")";
+  SLOG(Modem, 2) << __func__ << "(" << cdma_1x_state << ", "
+                 << evdo_state << ")";
   registration_state_callback_.Run(cdma_1x_state, evdo_state);
 }
 
 void ModemCDMAProxy::Proxy::ActivateCallback(const uint32_t &status,
                                              const DBus::Error &dberror,
                                              void *data) {
-  VLOG(2) << __func__ << "(" << status << ")";
+  SLOG(Modem, 2) << __func__ << "(" << status << ")";
   scoped_ptr<ActivationResultCallback> callback(
       reinterpret_cast<ActivationResultCallback *>(data));
   Error error;
@@ -141,7 +143,7 @@
 void ModemCDMAProxy::Proxy::GetRegistrationStateCallback(
     const uint32 &state_1x, const uint32 &state_evdo,
     const DBus::Error &dberror, void *data) {
-  VLOG(2) << __func__ << "(" << state_1x << ", " << state_evdo << ")";
+  SLOG(Modem, 2) << __func__ << "(" << state_1x << ", " << state_evdo << ")";
   scoped_ptr<RegistrationStateCallback> callback(
       reinterpret_cast<RegistrationStateCallback *>(data));
   Error error;
@@ -153,7 +155,7 @@
 void ModemCDMAProxy::Proxy::GetSignalQualityCallback(const uint32 &quality,
                                                      const DBus::Error &dberror,
                                                      void *data) {
-  VLOG(2) << __func__ << "(" << quality << ")";
+  SLOG(Modem, 2) << __func__ << "(" << quality << ")";
   scoped_ptr<SignalQualityCallback> callback(
       reinterpret_cast<SignalQualityCallback *>(data));
   Error error;