commit 44461fa5cbecd556691b0ba963f95973f6abece1
author henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Jan 13 09:35:02 2014 +0000
committer henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Jan 13 09:35:02 2014 +0000
tree cf45bc26abe9708bf59e1b110b3a4aab53af1a23
parent 8bc4fcfeb603a7236d3770a63d0107d1629b9f83

Revert 5367 "Update talk to 59410372."

> Update talk to 59410372.
> 
> R=jiayl@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/6929004

TBR=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5371 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/base/logging.cc

diff --git a/talk/base/logging.cc b/talk/base/logging.cc
index c1d0a53..4c7eae1 100644
--- a/talk/base/logging.cc
+++ b/talk/base/logging.cc
@@ -349,9 +349,6 @@
   }
 #endif  // WIN32
 
-  LogToDebug(debug_level);
-
-#if !defined(__native_client__)  // No logging to file in NaCl.
   scoped_ptr<FileStream> stream;
   if (NO_LOGGING != file_level) {
     stream.reset(new FileStream);
@@ -360,8 +357,8 @@
     }
   }
 
+  LogToDebug(debug_level);
   LogToStream(stream.release(), file_level);
-#endif
 }
 
 int LogMessage::ParseLogSeverity(const std::string& value) {