* Add 100ms network delay to test CaptureNtpTimeWithNetworkJitter.
* Re-enable test CaptureNtpTimeWithNetworkJitter.
* Use 100ms as the threadhold as a FYI since this is a performance test.

BUG=3271
R=stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6054 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/video/call_perf_tests.cc b/webrtc/video/call_perf_tests.cc
index 6b8ff96..85f21da 100644
--- a/webrtc/video/call_perf_tests.cc
+++ b/webrtc/video/call_perf_tests.cc
@@ -526,13 +526,13 @@
   TestCaptureNtpTime(net_config, kThresholdMs, kStartTimeMs, kRunTimeMs);
 }
 
-// Flaky, webrtc:3271.
-TEST_F(CallPerfTest, DISABLED_CaptureNtpTimeWithNetworkJitter) {
+TEST_F(CallPerfTest, CaptureNtpTimeWithNetworkJitter) {
   FakeNetworkPipe::Config net_config;
+  net_config.queue_delay_ms = 100;
   net_config.delay_standard_deviation_ms = 10;
   // TODO(wu): lower the threshold as the calculation/estimatation becomes more
   // accurate.
-  const int kThresholdMs = 30;
+  const int kThresholdMs = 100;
   const int kStartTimeMs = 10000;
   const int kRunTimeMs = 20000;
   TestCaptureNtpTime(net_config, kThresholdMs, kStartTimeMs, kRunTimeMs);