summaryrefslogtreecommitdiffstats
path: root/net/cookies/cookie_store_unittest.h
diff options
context:
space:
mode:
authorjgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-02 21:43:56 +0000
committerjgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-02 21:43:56 +0000
commitec3884679ed46fe11a4d2a1b3e7e056a5c94200f (patch)
treefaa9735b773ba1ee3845dfeff307e568969fed3a /net/cookies/cookie_store_unittest.h
parentd5e0855885214a92671a6496581617cc627c63b6 (diff)
downloadchromium_src-ec3884679ed46fe11a4d2a1b3e7e056a5c94200f.zip
chromium_src-ec3884679ed46fe11a4d2a1b3e7e056a5c94200f.tar.gz
chromium_src-ec3884679ed46fe11a4d2a1b3e7e056a5c94200f.tar.bz2
Remove ENABLE_PERSISTENT_SESSION_COOKIES
This isn't needed anymore now that CookieMonster::SetPersistSessionCookies exists. BUG=115372 Review URL: https://chromiumcodereview.appspot.com/10831117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cookies/cookie_store_unittest.h')
-rw-r--r--net/cookies/cookie_store_unittest.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h
index 5f9dd33..51c389d 100644
--- a/net/cookies/cookie_store_unittest.h
+++ b/net/cookies/cookie_store_unittest.h
@@ -1095,15 +1095,8 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckDeleteSessionCookies) {
"A=B", options));
EXPECT_TRUE(this->SetCookieWithOptions(cs, this->url_google_,
"B=C; expires=Mon, 18-Apr-22 22:50:13 GMT", options));
-
-#if defined(ENABLE_PERSISTENT_SESSION_COOKIES)
- EXPECT_EQ(0, this->DeleteSessionCookies(cs));
-#else
EXPECT_EQ(1, this->DeleteSessionCookies(cs));
-#endif
-
EXPECT_EQ(0, this->DeleteSessionCookies(cs));
-
EXPECT_TRUE(this->SetCookieWithOptions(cs, this->url_google_,
"A=B", options));
DeleteCallback callback(&this->other_thread_);
@@ -1113,12 +1106,7 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckDeleteSessionCookies) {
cs, &callback);
this->RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
-
-#if defined(ENABLE_PERSISTENT_SESSION_COOKIES)
- EXPECT_EQ(0, callback.num_deleted());
-#else
EXPECT_EQ(1, callback.num_deleted());
-#endif
}
REGISTER_TYPED_TEST_CASE_P(MultiThreadedCookieStoreTest,