Async Cookies: Address feedback from spec repository.

This CL integrates the following issues:

https://github.com/WICG/cookie-store/issues/54 - startsWith -> starts-with
https://github.com/WICG/cookie-store/issues/51 - remove cookieStore.has

Bug: 729800
Change-Id: If296a9e1eb896cb0ef344a889b1715836610bc6d
Reviewed-on: https://chromium-review.googlesource.com/1112912
Commit-Queue: Joshua Bell <jsbell@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570157}

third_party/WebKit/LayoutTests/external/wpt/cookie-store/cookieStore_getAll_arguments.tentative.window.js

@@ -84,14 +84,14 @@ promise_test(async testCase => {
   await cookieStore.set('cookie-name-2', 'cookie-value-2');
 
   const cookies = await cookieStore.getAll(
-      'cookie-name-', { matchType: 'startsWith' });
+      'cookie-name-', { matchType: 'starts-with' });
   assert_equals(cookies.length, 1);
   assert_equals(cookies[0].name, 'cookie-name-2');
   assert_equals(cookies[0].value, 'cookie-value-2');
 
   await async_cleanup(() => cookieStore.delete('cookie-name'));
   await async_cleanup(() => cookieStore.delete('cookie-name-2'));
-}, 'cookieStore.getAll with matchType set to startsWith');
+}, 'cookieStore.getAll with matchType set to starts-with');
 
 promise_test(async testCase => {
   await cookieStore.set('cookie-name', 'cookie-value');
@@ -109,11 +109,11 @@ promise_test(async testCase => {
   await cookieStore.set('cookie-name-2', 'cookie-value-2');
 
   const cookies = await cookieStore.getAll(
-      { matchType: 'startsWith', name: 'cookie-name-' });
+      { matchType: 'starts-with', name: 'cookie-name-' });
   assert_equals(cookies.length, 1);
   assert_equals(cookies[0].name, 'cookie-name-2');
   assert_equals(cookies[0].value, 'cookie-value-2');
 
   await async_cleanup(() => cookieStore.delete('cookie-name'));
   await async_cleanup(() => cookieStore.delete('cookie-name-2'));
-}, 'cookieStore.getAll with matchType set to startsWith and name in options');
+}, 'cookieStore.getAll with matchType set to starts-with and name in options');

third_party/WebKit/LayoutTests/external/wpt/cookie-store/cookieStore_get_arguments.tentative.window.js

@@ -58,12 +58,12 @@ promise_test(async testCase => {
   await cookieStore.set('cookie-name', 'cookie-value');
 
   const cookie = await cookieStore.get(
-      'cookie-na', { matchType: 'startsWith' });
+      'cookie-na', { matchType: 'starts-with' });
   assert_equals(cookie.name, 'cookie-name');
   assert_equals(cookie.value, 'cookie-value');
 
   async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.get with matchType set to startsWith');
+}, 'cookieStore.get with matchType set to starts-with');
 
 promise_test(async testCase => {
   await cookieStore.set('cookie-name', 'cookie-value');
@@ -78,9 +78,9 @@ promise_test(async testCase => {
   await cookieStore.set('cookie-name', 'cookie-value');
 
   const cookie = await cookieStore.get(
-      { matchType: 'startsWith', name: 'cookie-na' });
+      { matchType: 'starts-with', name: 'cookie-na' });
   assert_equals(cookie.name, 'cookie-name');
   assert_equals(cookie.value, 'cookie-value');
 
   async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.get with matchType set to startsWith and name in options');
+}, 'cookieStore.get with matchType set to starts-with and name in options');

third_party/WebKit/LayoutTests/external/wpt/cookie-store/cookieStore_has_arguments.tentative.window.js

-'use strict';
-
-// Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/web-platform-tests/wpt/issues/6075
-async function async_cleanup(cleanup_function) {
-  try {
-    await cleanup_function();
-  } catch (e) {
-    // Errors in cleanup functions shouldn't result in test failures.
-  }
-}
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  await cookieStore.delete('cookie-name-2');
-
-  const has_cookie = await cookieStore.has('cookie-name');
-  assert_equals(has_cookie, true);
-  const has_cookie2 = await cookieStore.has('cookie-name-2');
-  assert_equals(has_cookie2, false);
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has with positional name');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  await cookieStore.delete('cookie-name-2');
-
-  const has_cookie = await cookieStore.has({ name: 'cookie-name' });
-  assert_equals(has_cookie, true);
-  const has_cookie2 = await cookieStore.has({ name: 'cookie-name-2' });
-  assert_equals(has_cookie2, false);
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has with name in options');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-
-  await promise_rejects(testCase, new TypeError(), cookieStore.has(
-      'cookie-name', { name: 'cookie-name' }));
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has with name in both positional arguments and options');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-
-  const has_cookie = await cookieStore.has(
-      'cookie-na', { matchType: 'equals' });
-  assert_equals(has_cookie, false);
-  const has_cookie2 = await cookieStore.has(
-      'cookie-name', { matchType: 'equals' });
-  assert_equals(has_cookie2, true);
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has with matchType explicitly set to equals');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-
-  const has_cookie = await cookieStore.has(
-      'cookie-na', { matchType: 'startsWith' });
-  assert_equals(has_cookie, true);
-  const has_cookie2 = await cookieStore.has(
-      'cookie-name-', { matchType: 'startsWith' });
-  assert_equals(has_cookie2, false);
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has with matchType set to startsWith');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-
-  await promise_rejects(testCase, new TypeError(), cookieStore.has(
-      'cookie-name', { matchType: 'invalid' }));
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has with invalid matchType');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-
-  const has_cookie = await cookieStore.has(
-      { matchType: 'startsWith', name: 'cookie-na' });
-  assert_equals(has_cookie, true);
-  const has_cookie2 = await cookieStore.has(
-      { matchType: 'startsWith', name: 'cookie-name-' });
-  assert_equals(has_cookie2, false);
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has with matchType set to startsWith and name in options');

third_party/WebKit/LayoutTests/external/wpt/cookie-store/cookieStore_has_basic.tentative.window.js

-'use strict';
-
-// Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/web-platform-tests/wpt/issues/6075
-async function async_cleanup(cleanup_function) {
-  try {
-    await cleanup_function();
-  } catch (e) {
-    // Errors in cleanup functions shouldn't result in test failures.
-  }
-}
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  assert_equals(await cookieStore.has('cookie-name'), true);
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has returns true for cookie set by cookieStore.set()');
-
-promise_test(async testCase => {
-  await cookieStore.delete('cookie-name');
-  assert_equals(await cookieStore.has('cookie-name'), false);
-
-  await async_cleanup(() => cookieStore.delete('cookie-name'));
-}, 'cookieStore.has returns false for cookie deleted by cookieStore.delete()');

third_party/WebKit/LayoutTests/external/wpt/cookie-store/cookieStore_special_names.tentative.html

@@ -40,9 +40,9 @@
       null,
       'get with ${prefix} prefix name option should not reject');
     assert_equals(
-      await cookieStore.get({name: prefix, matchType: 'startsWith'}),
+      await cookieStore.get({name: prefix, matchType: 'starts-with'}),
       null,
-      'get with ${prefix} name and startsWith options should not reject');
+      'get with ${prefix} name and starts-with options should not reject');
   }, `cookieStore.get with ${prefix} name on non-secure origin`);
 
   promise_test(async testCase => {
@@ -55,9 +55,9 @@
       [],
       'getAll with ${prefix} prefix name option should not reject');
     assert_array_equals(
-      await cookieStore.getAll({name: prefix, matchType: 'startsWith'}),
+      await cookieStore.getAll({name: prefix, matchType: 'starts-with'}),
       [],
-      'getAll with ${prefix} name and startsWith options should not reject');
+      'getAll with ${prefix} name and starts-with options should not reject');
   }, `cookieStore.getAll with ${prefix} name on non-secure origin`);
 
   promise_test(async testCase => {

third_party/WebKit/LayoutTests/external/wpt/cookie-store/serviceworker_cookieStore_arguments.js

@@ -8,7 +8,6 @@ importScripts(
     "cookieStore_delete_arguments.tentative.window.js",
     "cookieStore_get_arguments.tentative.window.js",
     "cookieStore_getAll_arguments.tentative.window.js",
-    "cookieStore_has_arguments.tentative.window.js",
     "cookieStore_set_arguments.tentative.window.js");
 
 done();

third_party/WebKit/LayoutTests/external/wpt/cookie-store/serviceworker_cookieStore_basic.js

@@ -7,7 +7,6 @@ importScripts("/resources/testharness.js");
 importScripts(
     "cookieStore_get_delete_basic.tentative.window.js",
     "cookieStore_get_set_basic.tentative.window.js",
-    "cookieStore_getAll_set_basic.tentative.window.js",
-    "cookieStore_has_basic.tentative.window.js");
+    "cookieStore_getAll_set_basic.tentative.window.js");
 
 done();

third_party/WebKit/LayoutTests/external/wpt/cookie-store/serviceworker_cookieStore_subscriptions.js

@@ -13,7 +13,7 @@ self.addEventListener('install', (event) => {
       { name: 'cookie-name1', matchType: 'equals', url: '/scope/path1' }]);
     await cookieStore.subscribeToChanges([
       { },  // Test the default values for subscription properties.
-      { name: 'cookie-prefix', matchType: 'startsWith' },
+      { name: 'cookie-prefix', matchType: 'starts-with' },
     ]);
   })());
 });
@@ -54,10 +54,10 @@ promise_test(async testCase => {
   assert_equals('equals', subscriptions[0].matchType);
 
   assert_equals(subscriptions[1].name, 'cookie-prefix');
-  assert_equals('startsWith', subscriptions[1].matchType);
+  assert_equals('starts-with', subscriptions[1].matchType);
 
   assert_false('name' in subscriptions[2]);
-  assert_equals('startsWith', subscriptions[2].matchType);
+  assert_equals('starts-with', subscriptions[2].matchType);
 }, 'getChangeSubscriptions returns subscriptions passed to subscribeToChanges');
 
 promise_test(async testCase => {

third_party/WebKit/LayoutTests/external/wpt/interfaces/cookie-store.idl

@@ -3,6 +3,10 @@
 dictionary CookieListItem {
   USVString name;
   USVString value;
+  USVString? domain;
+  USVString path;
+  DOMTimeStamp? expires;
+  boolean secure;
 };
 
 typedef sequence<CookieListItem> CookieList;
@@ -35,7 +39,7 @@ dictionary ExtendableCookieChangeEventInit : ExtendableEventInit {
 
 enum CookieMatchType {
   "equals",
-  "startsWith"
+  "starts-with"
 };
 
 dictionary CookieStoreGetOptions {
@@ -63,9 +67,6 @@ dictionary CookieStoreSetOptions {
   Promise<CookieListItem?> get(USVString name, optional CookieStoreGetOptions options);
   Promise<CookieListItem?> get(optional CookieStoreGetOptions options);
 
-  Promise<boolean> has(USVString name, optional CookieStoreGetOptions options);
-  Promise<boolean> has(optional CookieStoreGetOptions options);
-
   Promise<void> set(USVString name, USVString value, optional CookieStoreSetOptions options);
   Promise<void> set(CookieStoreSetOptions options);
 

third_party/WebKit/LayoutTests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt

@@ -165,7 +165,6 @@ interface CookieStore : EventTarget
     method get
     method getAll
     method getChangeSubscriptions
-    method has
     method set
     method subscribeToChanges
 interface CountQueuingStrategy

third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt

@@ -1104,7 +1104,6 @@ interface CookieStore : EventTarget
     method delete
     method get
     method getAll
-    method has
     method set
     setter onchange
 interface CountQueuingStrategy

third_party/blink/renderer/modules/cookie_store/cookie_store.cc

@@ -40,7 +40,7 @@ network::mojom::blink::CookieManagerGetOptionsPtr ToBackendOptions(
 
   // TODO(crbug.com/729800): Handle the url option.
 
-  if (options.matchType() == "startsWith") {
+  if (options.matchType() == "starts-with") {
     backend_options->match_type =
         network::mojom::blink::CookieMatchType::STARTS_WITH;
   } else {
@@ -205,7 +205,7 @@ blink::mojom::blink::CookieChangeSubscriptionPtr ToBackendSubscription(
     backend_subscription->url = default_cookie_url;
   }
 
-  if (subscription.matchType() == "startsWith") {
+  if (subscription.matchType() == "starts-with") {
     backend_subscription->match_type =
         network::mojom::blink::CookieMatchType::STARTS_WITH;
   } else {
@@ -240,7 +240,7 @@ void ToCookieChangeSubscription(
 
   switch (backend_subscription.match_type) {
     case network::mojom::blink::CookieMatchType::STARTS_WITH:
-      subscription.setMatchType(WTF::String("startsWith"));
+      subscription.setMatchType(WTF::String("starts-with"));
       break;
     case network::mojom::blink::CookieMatchType::EQUALS:
       subscription.setMatchType(WTF::String("equals"));
@@ -310,20 +310,6 @@ ScriptPromise CookieStore::get(ScriptState* script_state,
                 &CookieStore::GetAllForUrlToGetResult, exception_state);
 }
 
-ScriptPromise CookieStore::has(ScriptState* script_state,
-                               const CookieStoreGetOptions& options,
-                               ExceptionState& exception_state) {
-  return has(script_state, WTF::String(), options, exception_state);
-}
-
-ScriptPromise CookieStore::has(ScriptState* script_state,
-                               const String& name,
-                               const CookieStoreGetOptions& options,
-                               ExceptionState& exception_state) {
-  return DoRead(script_state, name, options,
-                &CookieStore::GetAllForUrlToHasResult, exception_state);
-}
-
 ScriptPromise CookieStore::set(ScriptState* script_state,
                                const CookieStoreSetOptions& options,
                                ExceptionState& exception_state) {
@@ -550,17 +536,6 @@ void CookieStore::GetAllForUrlToGetResult(
   resolver->Resolve(cookie);
 }
 
-// static
-void CookieStore::GetAllForUrlToHasResult(
-    ScriptPromiseResolver* resolver,
-    const Vector<WebCanonicalCookie>& backend_cookies) {
-  ScriptState* script_state = resolver->GetScriptState();
-  if (!script_state->ContextIsValid())
-    return;
-
-  resolver->Resolve(!backend_cookies.IsEmpty());
-}
-
 ScriptPromise CookieStore::DoWrite(ScriptState* script_state,
                                    const String& name,
                                    const String& value,

third_party/blink/renderer/modules/cookie_store/cookie_store.h

@@ -57,13 +57,6 @@ class CookieStore final : public EventTargetWithInlineData,
                     const String& name,
                     const CookieStoreGetOptions&,
                     ExceptionState&);
-  ScriptPromise has(ScriptState*,
-                    const CookieStoreGetOptions&,
-                    ExceptionState&);
-  ScriptPromise has(ScriptState*,
-                    const String& name,
-                    const CookieStoreGetOptions&,
-                    ExceptionState&);
 
   ScriptPromise set(ScriptState*,
                     const CookieStoreSetOptions&,
@@ -144,12 +137,6 @@ class CookieStore final : public EventTargetWithInlineData,
       ScriptPromiseResolver*,
       const Vector<WebCanonicalCookie>& backend_result);
 
-  // Converts the result of a RestrictedCookieManager::GetAllForUrl mojo call to
-  // the promise result expected by CookieStore.has.
-  static void GetAllForUrlToHasResult(
-      ScriptPromiseResolver*,
-      const Vector<WebCanonicalCookie>& backend_result);
-
   // Common code in CookieStore::delete and CookieStore::set.
   ScriptPromise DoWrite(ScriptState*,
                         const String& name,

third_party/blink/renderer/modules/cookie_store/cookie_store.idl

@@ -17,10 +17,6 @@
       USVString name, optional CookieStoreGetOptions options);
   [CallWith=ScriptState, Measure, RaisesException] Promise<CookieListItem?> get(
       optional CookieStoreGetOptions options);
-  [CallWith=ScriptState, Measure, RaisesException] Promise<boolean> has(
-      USVString name, optional CookieStoreGetOptions options);
-  [CallWith=ScriptState, Measure, RaisesException] Promise<boolean> has(
-      optional CookieStoreGetOptions options);
 
   // https://github.com/WICG/async-cookies-api/blob/gh-pages/explainer.md#writing
   [CallWith=ScriptState, Measure, RaisesException] Promise<void> set(

third_party/blink/renderer/modules/cookie_store/cookie_store_get_options.idl

@@ -6,7 +6,7 @@
 
 enum CookieMatchType {
   "equals",
-  "startsWith"
+  "starts-with"
 };
 
 dictionary CookieStoreGetOptions {