shill: Rename SMLOG to SLOG
Rewrite SMLOG as SLOG, thus saving many edits. Change the location of
the SLOG macro to be memory_log.h, requiring includes to be rewritten
and reordered. While we're rewriting includes, moving all assorted
logging includes into a generic shill/logging.h, thus saving future
logging changes from altering these includes ever again.
BUG=chromium-os:31145
TEST=Builds, unit tests still pass
Change-Id: Ie5129fcbdda87f3149460209a682c698b876b09a
Reviewed-on: https://gerrit.chromium.org/gerrit/29650
Commit-Ready: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Tested-by: Christopher Wiley <wiley@chromium.org>
diff --git a/dhcp_config.cc b/dhcp_config.cc
index 7e879e4..0924ea2 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -8,7 +8,6 @@
#include <sys/wait.h>
#include <base/file_util.h>
-#include <base/logging.h>
#include <base/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
@@ -17,9 +16,9 @@
#include "shill/event_dispatcher.h"
#include "shill/glib.h"
#include "shill/ip_address.h"
+#include "shill/logging.h"
#include "shill/minijail.h"
#include "shill/proxy_factory.h"
-#include "shill/scope_logger.h"
using std::string;
using std::vector;