summaryrefslogtreecommitdiffstats
path: root/net/cookies/cookie_store_unittest.h
diff options
context:
space:
mode:
authormnissler <mnissler@chromium.org>2015-10-19 01:08:42 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-19 08:09:34 +0000
commitc236d3b2efe063dc0914e2bebdb4c28cac7fa6c2 (patch)
tree04f66a5d79f09de365337851e23e4c8d2d56edec /net/cookies/cookie_store_unittest.h
parent3d5d4e33ef71fecdafaaa920ad5a1b4fe03d13fb (diff)
downloadchromium_src-c236d3b2efe063dc0914e2bebdb4c28cac7fa6c2.zip
chromium_src-c236d3b2efe063dc0914e2bebdb4c28cac7fa6c2.tar.gz
chromium_src-c236d3b2efe063dc0914e2bebdb4c28cac7fa6c2.tar.bz2
Revert of Implement $Secure- cookie prefix (patchset #16 id:420001 of https://codereview.chromium.org/1393193005/ )
Reason for revert: Broke net_unittests on Android: I 63.275s run_tests_on_device(06b2a92a003bca26) [ RUN ] URLRequestTest.SecureCookiePrefixOnNonsecureOrigin I 63.275s run_tests_on_device(06b2a92a003bca26) [ERROR:spawner_communicator.cc(241)] request failed, status: 3, error: -324 I 63.275s run_tests_on_device(06b2a92a003bca26) ../../net/url_request/url_request_unittest.cc:2737: Failure I 63.276s run_tests_on_device(06b2a92a003bca26) Value of: test_server_https.Start() I 63.276s run_tests_on_device(06b2a92a003bca26) Actual: false I 63.276s run_tests_on_device(06b2a92a003bca26) Expected: true I 63.276s run_tests_on_device(06b2a92a003bca26) [ERROR:spawner_communicator.cc(241)] request failed, status: 3, error: -324 I 63.276s run_tests_on_device(06b2a92a003bca26) [ FAILED ] URLRequestTest.SecureCookiePrefixOnNonsecureOrigin (487 ms) http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/30742 http://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/22819 Original issue's description: > Implement $Secure- cookie prefix > > This CL implements the rule that cookies whose names start with > $Secure- can only be set if the Secure attribute is enabled. The > implementation is a runtime-enabled web platform feature for now. > > Intent to Implement: > https://groups.google.com/a/chromium.org/d/msg/blink-dev/IU5t6eLuS2Y/Uq-7Kat9BwAJ > > BUG=541511 > TBR=droger@chromium.org > > Committed: https://crrev.com/467a098174e062d4380eb0ad8f7b2f0b0b7ed5fa > Cr-Commit-Position: refs/heads/master@{#354676} TBR=mkwst@chromium.org,jochen@chromium.org,mmenke@chromium.org,droger@chromium.org,estark@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=541511 Review URL: https://codereview.chromium.org/1409243003 Cr-Commit-Position: refs/heads/master@{#354736}
Diffstat (limited to 'net/cookies/cookie_store_unittest.h')
-rw-r--r--net/cookies/cookie_store_unittest.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h
index f62f7ac..b380fbc 100644
--- a/net/cookies/cookie_store_unittest.h
+++ b/net/cookies/cookie_store_unittest.h
@@ -69,9 +69,6 @@ const char kValidCookieLine[] = "A=B; path=/";
// // Time to wait between two cookie insertions to ensure that cookies have
// // different creation times.
// static const int creation_time_granularity_in_ms;
-//
-// // The cookie store enforces cookie prefixes.
-// static const bool enforces_prefixes;
// };
template <class CookieStoreTestTraits>
@@ -158,8 +155,6 @@ class CookieStoreTest : public testing::Test {
CookieOptions options;
if (!CookieStoreTestTraits::supports_http_only)
options.set_include_httponly();
- if (CookieStoreTestTraits::enforces_prefixes)
- options.set_enforce_prefixes();
return SetCookieWithOptions(cs, url, cookie_line, options);
}