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/openvpn_management_server.cc b/openvpn_management_server.cc
index cc0aba4..9349cfb 100644
--- a/openvpn_management_server.cc
+++ b/openvpn_management_server.cc
@@ -8,7 +8,6 @@
#include <netinet/in.h>
#include <base/bind.h>
-#include <base/logging.h>
#include <base/string_number_conversions.h>
#include <base/string_split.h>
#include <base/string_util.h>
@@ -17,8 +16,8 @@
#include "shill/event_dispatcher.h"
#include "shill/glib.h"
+#include "shill/logging.h"
#include "shill/openvpn_driver.h"
-#include "shill/scope_logger.h"
#include "shill/sockets.h"
using base::Bind;