commit 0f3356e20b70416f13e12ef596da66f6c347eea7
author mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Sat Jan 11 01:26:23 2014 +0000
committer mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Sat Jan 11 01:26:23 2014 +0000
tree f1f43760bd04d336d3bfa980c1efb2068039eab0
parent 023cc5abc7d25fb3133b4d0206b67dcc6204b6e8

Update talk to 59410372.

R=jiayl@webrtc.org, wu@webrtc.org

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

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

talk/base/logging.cc

diff --git a/talk/base/logging.cc b/talk/base/logging.cc
index 4c7eae1..c1d0a53 100644
--- a/talk/base/logging.cc
+++ b/talk/base/logging.cc
@@ -349,6 +349,9 @@
   }
 #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);
@@ -357,8 +360,8 @@
     }
   }
 
-  LogToDebug(debug_level);
   LogToStream(stream.release(), file_level);
+#endif
 }
 
 int LogMessage::ParseLogSeverity(const std::string& value) {