Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Unified Diff: net/cookies/cookie_store_unittest.h

Issue 10831117: Remove ENABLE_PERSISTENT_SESSION_COOKIES (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cookies/cookie_monster_unittest.cc ('k') | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cookies/cookie_store_unittest.h
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h
index 5f9dd3376b2f0a3865d1a76a1c26a0bbca5900e3..51c389da293d2c0c1c6ffae9223a9df789605613 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,
« no previous file with comments | « net/cookies/cookie_monster_unittest.cc ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698