diff options
| author | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 23:44:48 +0000 |
|---|---|---|
| committer | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 23:44:48 +0000 |
| commit | 16465ec641d4332ae4265e81e96bce91460757d1 (patch) | |
| tree | df520a1d2d34c95b670912e085ed8d0726c1d54e /net/disk_cache | |
| parent | d10bbddf86c71cc0843e7171af9cd5a1cdfd5ecb (diff) | |
| download | chromium_src-16465ec641d4332ae4265e81e96bce91460757d1.zip chromium_src-16465ec641d4332ae4265e81e96bce91460757d1.tar.gz chromium_src-16465ec641d4332ae4265e81e96bce91460757d1.tar.bz2 | |
Reorder assertions in SimpleCache race test.
By placing the ASSERT second, and waiting on the result from the Create first, we ensure
that we never exit this function between the callback on cb2.callback() has been called.
That's important, because cb2.callback() references members of cb2, so it's illegal to call
after destruction.
R=pasko
BUG=None
Review URL: https://chromiumcodereview.appspot.com/15808014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
| -rw-r--r-- | net/disk_cache/entry_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc index 97a6c11..c683745 100644 --- a/net/disk_cache/entry_unittest.cc +++ b/net/disk_cache/entry_unittest.cc @@ -3127,8 +3127,8 @@ TEST_F(DiskCacheEntryTest, SimpleCacheOpenCreateRaceWithNoIndex) { int rv1 = cache_->OpenEntry("key", &entry1, cb1.callback()); int rv2 = cache_->CreateEntry("key", &entry2, cb2.callback()); - ASSERT_EQ(net::OK, cb2.GetResult(rv2)); EXPECT_EQ(net::ERR_FAILED, cb1.GetResult(rv1)); + ASSERT_EQ(net::OK, cb2.GetResult(rv2)); entry2->Close(); } |