summaryrefslogtreecommitdiffstats
path: root/net/extras
diff options
context:
space:
mode:
authortapted <tapted@chromium.org>2015-12-02 20:43:05 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-03 04:43:42 +0000
commit012326b1c4342b0bf2dde88d326efbed06ebcf9b (patch)
tree4c234dfbaa0add8025edce0f5b310c87788b0e84 /net/extras
parent6adbf2e61e7a6a3dae0c72d5dcf946a6535c13df (diff)
downloadchromium_src-012326b1c4342b0bf2dde88d326efbed06ebcf9b.zip
chromium_src-012326b1c4342b0bf2dde88d326efbed06ebcf9b.tar.gz
chromium_src-012326b1c4342b0bf2dde88d326efbed06ebcf9b.tar.bz2
Reland of Tests: Simplify SequencedWorkerPoolOwner, call Shutdown on destructor. (patchset #1 id:1 of https://codereview.chromium.org/1496493004/ )
Reason for revert: Relanding, no recovery in https://build.chromium.org/p/chromium.mac/builders/iOS_Simulator_%28dbg%29/builds/32878 Original issue's description: > Revert of Tests: Simplify SequencedWorkerPoolOwner, call Shutdown on destructor. (patchset #4 id:60001 of https://codereview.chromium.org/1417353006/ ) > > Reason for revert: > Suspected for persistent failures on ios_net_unittests > > - RoundTripTestCookieStore/CookieStoreTest/0.TestNonDottedAndTLD > - CookieStoreIOS/CookieStoreTest/0.TestNonDottedAndTLD > > Failing since https://build.chromium.org/p/chromium.mac/builders/iOS_Simulator_%28dbg%29/builds/32876 > > Errors like > > ../../net/cookies/cookie_store_unittest.h:536: Failure > Value of: this->SetCookie(cs.get(), url, "a=1; domain=com") > Actual: false > Expected: true > > (It's a tricky one! Sorry if this is not it) > > Original issue's description: > > Tests: Simplify SequencedWorkerPoolOwner, call Shutdown on destructor. > > > > Also ports remaining tests using raw SWPs to use SWPOwner. > > > > BUG=450228 > > > > Committed: https://crrev.com/fc939726c283e34112d9bc845a39460410fe9cd9 > > Cr-Commit-Position: refs/heads/master@{#362805} > > TBR=phajdan.jr@chromium.org,jam@chromium.org,brettw@chromium.org,tommycli@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=450228 > > Committed: https://crrev.com/d7365d9aaa55e88d9ecca49eb2158b62d1190f09 > Cr-Commit-Position: refs/heads/master@{#362890} TBR=phajdan.jr@chromium.org,jam@chromium.org,brettw@chromium.org,tommycli@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=450228 Review URL: https://codereview.chromium.org/1500503002 Cr-Commit-Position: refs/heads/master@{#362907}
Diffstat (limited to 'net/extras')
-rw-r--r--net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc1
-rw-r--r--net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc1
2 files changed, 0 insertions, 2 deletions
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc
index b149ac0..4be580b 100644
--- a/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc
@@ -99,7 +99,6 @@ class SQLitePersistentCookieStorePerfTest : public testing::Test {
void TearDown() override {
store_ = NULL;
- pool_owner_->pool()->Shutdown();
}
protected:
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
index fd140ea..92965ee 100644
--- a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
@@ -196,7 +196,6 @@ class SQLitePersistentCookieStoreTest : public testing::Test {
void TearDown() override {
DestroyStore();
- pool_owner_->pool()->Shutdown();
}
protected: