commit c3e5d3422b890eb0a33361dc03784c17f8956128
author andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Nov 23 19:30:59 2012 +0000
committer andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Nov 23 19:30:59 2012 +0000
tree 76265ad642d93a8c69db7b6dae093bf33a53c462
parent 418443c53131d9fba0784f907a2c8599d971d8d6

Add a logging_no_op.cc when enable_tracing==0.

This should hopefully fix static initializer warnings when rolling webrtc
in Chromium.

TEST=logging_unittest succeeds with enable_tracing==1 and fails appropriately with enable_tracing==0.

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

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

webrtc/system_wrappers/source/logging_unittest.cc

diff --git a/webrtc/system_wrappers/source/logging_unittest.cc b/webrtc/system_wrappers/source/logging_unittest.cc
index 6f36aba..8d8a580 100644
--- a/webrtc/system_wrappers/source/logging_unittest.cc
+++ b/webrtc/system_wrappers/source/logging_unittest.cc
@@ -73,7 +73,7 @@
     std::string msg = "Important message";
     expected_log_ << "(logging_unittest.cc:" << __LINE__ + 1 << "): " << msg;
     LOG(LS_WARNING) << msg;
-    cv_->SleepCS(*crit_.get());
+    cv_->SleepCS(*crit_.get(), 2000);
   }
 }
 
@@ -86,7 +86,7 @@
     expected_log_ << "(logging_unittest.cc:" << __LINE__ + 2
                   << "): Foo failed: bar=" << bar << ", baz=" << baz;
     LOG_FERR2(LS_ERROR, Foo, bar, baz);
-    cv_->SleepCS(*crit_.get());
+    cv_->SleepCS(*crit_.get(), 2000);
   }
 }