Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
diff --git a/base/logging.cc b/base/logging.cc
index 7f9caff..462ac8b 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -49,7 +49,7 @@
#include "base/debug/alias.h"
#include "base/debug/debugger.h"
#include "base/debug/stack_trace.h"
-#include "base/eintr_wrapper.h"
+#include "base/posix/eintr_wrapper.h"
#include "base/string_piece.h"
#include "base/synchronization/lock_impl.h"
#include "base/threading/platform_thread.h"
@@ -854,6 +854,14 @@
// This was defined at the beginning of this file.
#undef write
+#if defined(OS_WIN)
+std::wstring GetLogFileFullPath() {
+ if (log_file_name)
+ return *log_file_name;
+ return std::wstring();
+}
+#endif
+
} // namespace logging
std::ostream& operator<<(std::ostream& out, const wchar_t* wstr) {