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

Unified Diff: ios/net/cookies/cookie_store_ios_unittest.mm

Issue 2596653003: [ios] Removed CookieStoreIOS::SetCookiePolicy. (Closed)
Patch Set: Created 4 years 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 | « ios/net/cookies/cookie_store_ios.mm ('k') | ios/web/public/web_capabilities.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/net/cookies/cookie_store_ios_unittest.mm
diff --git a/ios/net/cookies/cookie_store_ios_unittest.mm b/ios/net/cookies/cookie_store_ios_unittest.mm
index 87c7bd4e9b0c00f359566630b2112e7c5ca9541b..98e63bdb4aa560127a99f184110d5bd91b4cea5d 100644
--- a/ios/net/cookies/cookie_store_ios_unittest.mm
+++ b/ios/net/cookies/cookie_store_ios_unittest.mm
@@ -373,7 +373,6 @@ class CookieStoreIOSWithBackend : public testing::Test {
kTestCookieURL4("http://bar.google.com/bar"),
backend_(new TestPersistentCookieStore),
store_(new net::CookieStoreIOS(backend_.get())) {
- net::CookieStoreIOS::SetCookiePolicy(net::CookieStoreIOS::ALLOW);
cookie_changed_callback_ = store_->AddCallbackForCookie(
kTestCookieURL, "abc",
base::Bind(&RecordCookieChanges, &cookies_changed_, &cookies_removed_));
@@ -544,15 +543,7 @@ TEST(CookieStoreIOS, GetAllCookiesForURLAsync) {
options.set_include_httponly();
cookie_store->SetCookieWithOptionsAsync(
kTestCookieURL, "a=b", options, net::CookieStore::SetCookiesCallback());
- // Disallow cookies.
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::BLOCK);
- // No cookie in the system store.
- NSHTTPCookieStorage* system_store =
- [NSHTTPCookieStorage sharedHTTPCookieStorage];
- EXPECT_EQ(0u, [[system_store cookies] count]);
- // Flushing should not have any effect.
- cookie_store->FlushStore(base::Closure());
- // Check we can get the cookie even though cookies are disabled.
+ // Check we can get the cookie.
GetAllCookiesCallback callback;
cookie_store->GetAllCookiesForURLAsync(
kTestCookieURL,
@@ -562,11 +553,6 @@ TEST(CookieStoreIOS, GetAllCookiesForURLAsync) {
net::CanonicalCookie cookie = callback.cookie_list()[0];
EXPECT_EQ("a", cookie.Name());
EXPECT_EQ("b", cookie.Value());
- // Re-enable cookies.
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::ALLOW);
- // Cookie is back in the system store.
- EXPECT_EQ(1u, [[system_store cookies] count]);
- cookie_store->UnSynchronize();
}
// Tests that cookies can be read before the backend is loaded.
@@ -593,24 +579,6 @@ TEST_F(CookieStoreIOSWithBackend, Synchronizing) {
store_->UnSynchronize();
}
-// Tests that cookies can be read before synchronization is complete, when
-// triggered by a change in cookie policy.
-TEST_F(CookieStoreIOSWithBackend, SynchronizingAfterPolicyChange) {
- ClearCookies();
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::BLOCK);
- // SwitchSynchronizedStore() does nothing when cookies are blocked.
- CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
- // Start synchronization by allowing cookies.
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::ALLOW);
- GetCookieCallback callback;
- GetCookies(base::Bind(&GetCookieCallback::Run, base::Unretained(&callback)));
- // Backend loading completes (end of synchronization).
- backend_->RunLoadedCallback();
- EXPECT_TRUE(callback.did_run());
- EXPECT_EQ("a=b", callback.cookie_line());
- store_->UnSynchronize();
-}
-
// Tests that Synchronization can be "aborted" (i.e. the cookie store is
// unsynchronized while synchronization is in progress).
TEST_F(CookieStoreIOSWithBackend, SyncThenUnsync) {
@@ -652,55 +620,6 @@ TEST_F(CookieStoreIOSWithBackend, SyncThenUnsyncWithPendingTasks) {
dummy_store->UnSynchronize();
}
-TEST_F(CookieStoreIOSWithBackend, ChangePolicyOnceDuringSynchronization) {
- // Start synchronization.
- CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
- // Toggle cookie policy to trigger another synchronization while the first one
- // is still in progress.
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::BLOCK);
- // Backend loading completes (end of synchronization).
- backend_->RunLoadedCallback();
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::ALLOW);
- GetCookieCallback callback;
- GetCookies(base::Bind(&GetCookieCallback::Run, base::Unretained(&callback)));
- EXPECT_TRUE(callback.did_run());
- EXPECT_EQ("a=b", callback.cookie_line());
- store_->UnSynchronize();
-}
-
-TEST_F(CookieStoreIOSWithBackend,
- ChangePolicyDuringSynchronizationWithPendingTask) {
- // Start synchronization.
- CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
- // Create a pending task while synchronization is in progress.
- GetCookieCallback callback;
- GetCookies(base::Bind(&GetCookieCallback::Run, base::Unretained(&callback)));
- // Toggle cookie policy to trigger another synchronization while the first one
- // is still in progress.
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::BLOCK);
- // Backend loading completes (end of synchronization).
- backend_->RunLoadedCallback();
- EXPECT_TRUE(callback.did_run());
- EXPECT_EQ("a=b", callback.cookie_line());
- store_->UnSynchronize();
-}
-
-TEST_F(CookieStoreIOSWithBackend, ChangePolicyTwiceDuringSynchronization) {
- // Start synchronization.
- CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
- // Toggle cookie policy to trigger another synchronization while the first one
- // is still in progress.
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::BLOCK);
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::ALLOW);
- // Backend loading completes (end of synchronization).
- backend_->RunLoadedCallback();
- GetCookieCallback callback;
- GetCookies(base::Bind(&GetCookieCallback::Run, base::Unretained(&callback)));
- EXPECT_TRUE(callback.did_run());
- EXPECT_EQ("a=b", callback.cookie_line());
- store_->UnSynchronize();
-}
-
TEST_F(CookieStoreIOSWithBackend, UnSynchronizeBeforeLoadComplete) {
ClearCookies();
// Switch back and forth before synchronization can complete.
@@ -767,17 +686,6 @@ TEST_F(CookieStoreIOSWithBackend, ManualFlush) {
store_->UnSynchronize();
}
-TEST_F(CookieStoreIOSWithBackend, FlushOnPolicyChange) {
- // Start synchronization.
- CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
- // Toggle cookie policy to trigger a flush.
- EXPECT_FALSE(backend_->flushed());
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::BLOCK);
- EXPECT_TRUE(backend_->flushed());
- store_->UnSynchronize();
- CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::ALLOW);
-}
-
TEST_F(CookieStoreIOSWithBackend, NoInitialNotifyWithNoCookie) {
CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
std::vector<net::CanonicalCookie> cookies;
« no previous file with comments | « ios/net/cookies/cookie_store_ios.mm ('k') | ios/web/public/web_capabilities.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698