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/wimax_network_proxy.cc b/wimax_network_proxy.cc
index 7b2dede..2d3c04e 100644
--- a/wimax_network_proxy.cc
+++ b/wimax_network_proxy.cc
@@ -4,11 +4,10 @@
#include "shill/wimax_network_proxy.h"
-#include <base/logging.h>
#include <chromeos/dbus/service_constants.h>
#include "shill/error.h"
-#include "shill/scope_logger.h"
+#include "shill/logging.h"
using std::string;