summaryrefslogtreecommitdiffstats
path: root/base/test
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-16 04:32:49 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-16 04:32:49 +0000
commite91ce809048b33f62569a01404b833d3aa9f15d0 (patch)
tree4e6be1ba994b3598dd3365f180bd2b16be39e9a0 /base/test
parent8a503d82ee9191362194a1337a44541caa34de07 (diff)
downloadchromium_src-e91ce809048b33f62569a01404b833d3aa9f15d0.zip
chromium_src-e91ce809048b33f62569a01404b833d3aa9f15d0.tar.gz
chromium_src-e91ce809048b33f62569a01404b833d3aa9f15d0.tar.bz2
Fix TraceEventTestFixture flakiness
BUG=142804 Review URL: https://chromiumcodereview.appspot.com/10828326 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
-rw-r--r--base/test/trace_event_analyzer_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc
index dd1ce4d..63760a4 100644
--- a/base/test/trace_event_analyzer_unittest.cc
+++ b/base/test/trace_event_analyzer_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/bind.h"
+#include "base/debug/trace_event_unittest.h"
#include "base/test/trace_event_analyzer.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -392,7 +393,7 @@ TEST_F(TraceEventAnalyzerTest, Duration) {
{
TRACE_EVENT0("cat2", "name3"); // found by duration query
TRACE_EVENT_INSTANT0("noise", "name4"); // not searched for, just noise
- base::PlatformThread::Sleep(kSleepTime);
+ base::debug::HighResSleepForTraceTest(kSleepTime);
TRACE_EVENT0("cat2", "name5"); // not found (duration too short)
}
}