From cc3459a0d4dedb66e0fc6142ddfdd6b68fb0dc03 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Fri, 20 Jan 2017 18:21:38 -0500
Subject: [PATCH] Bug 1331495 - Move operator<< overloads for mozilla::Logger
 inside namespace mozilla. r=froydnj

MozReview-Commit-ID: LqAx0zXVkgc

--HG--
extra : rebase_source : df18a96013158d238d505c5791ce176948987e83
---
 ipc/chromium/src/base/logging.cc | 3 ++-
 ipc/chromium/src/base/logging.h  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ipc/chromium/src/base/logging.cc b/ipc/chromium/src/base/logging.cc
index d793990de433..2cb5e4b1c39b 100644
--- a/ipc/chromium/src/base/logging.cc
+++ b/ipc/chromium/src/base/logging.cc
@@ -61,7 +61,6 @@ Logger::printf(const char* fmt, ...)
 }
 
 LazyLogModule Logger::gChromiumPRLog("chromium");
-} // namespace mozilla 
 
 mozilla::Logger&
 operator<<(mozilla::Logger& log, const char* s)
@@ -97,3 +96,5 @@ operator<<(mozilla::Logger& log, void* p)
   log.printf("%p", p);
   return log;
 }
+
+} // namespace mozilla
diff --git a/ipc/chromium/src/base/logging.h b/ipc/chromium/src/base/logging.h
index 37523d307e44..67ec8ac07a21 100644
--- a/ipc/chromium/src/base/logging.h
+++ b/ipc/chromium/src/base/logging.h
@@ -76,8 +76,6 @@ struct EmptyLog
 {
 };
 
-} // namespace mozilla
-
 mozilla::Logger& operator<<(mozilla::Logger& log, const char* s);
 mozilla::Logger& operator<<(mozilla::Logger& log, const std::string& s);
 mozilla::Logger& operator<<(mozilla::Logger& log, int i);
@@ -90,6 +88,8 @@ const mozilla::EmptyLog& operator <<(const mozilla::EmptyLog& log, const T&)
   return log;
 }
 
+} // namespace mozilla
+
 #ifdef NO_CHROMIUM_LOGGING
 #define CHROMIUM_LOG(info) std::stringstream()
 #define LOG_IF(info, condition) if (!(condition)) std::stringstream()