summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-05 21:33:38 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-05 21:33:38 +0000
commit8f9eb9f902cde0195f2473eedaafacaa3241d9dd (patch)
tree570a752fd8af926d323e89659da8e4fee9dc1bdb
parent88520473fe1a2a90c8ae5f1199f382d6d529922d (diff)
downloadchromium_src-8f9eb9f902cde0195f2473eedaafacaa3241d9dd.zip
chromium_src-8f9eb9f902cde0195f2473eedaafacaa3241d9dd.tar.gz
chromium_src-8f9eb9f902cde0195f2473eedaafacaa3241d9dd.tar.bz2
Wait for just RECEIVED_PONG, which verifies that we have
SENT_PING and got RECIVED_PONG. BUG=74949 TEST=ThreadWatcherTest (unit tests) on Linux R=jar Review URL: http://codereview.chromium.org/6627014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77053 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/metrics/thread_watcher_unittest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc
index d191fd6..d65ccef 100644
--- a/chrome/browser/metrics/thread_watcher_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_unittest.cc
@@ -340,8 +340,6 @@ TEST_F(ThreadWatcherTest, ThreadResponding) {
// ping/pong messaging sequence to happen.
io_watcher_->WaitForStateChange(kSleepTime + TimeDelta::FromMinutes(1),
RECEIVED_PONG);
- io_watcher_->WaitForStateChange(kSleepTime + TimeDelta::FromMinutes(1),
- SENT_PING);
EXPECT_GT(io_watcher_->ping_sent_, static_cast<uint64>(0));
EXPECT_GT(io_watcher_->pong_received_, static_cast<uint64>(0));
EXPECT_TRUE(io_watcher_->active());