Update Durable Storage API method signature

Instead of returning a permission string, requestPersistent() was
recently changed to return a boolean representing the value of the default
box.

This is an experimental API only exposed behind a flag. The spec is at
https://storage.spec.whatwg.org/

BUG=482814

Review URL: https://codereview.chromium.org/1302643002

git-svn-id: svn://svn.chromium.org/blink/trunk@200795 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/http/tests/storage/durability-basics.html

@@ -12,11 +12,10 @@ promise_test(function() {
     assert_true(promise instanceof Promise,
         "navigator.storage.requestPersistent() returned a Promise.")
     return promise.then(function (result) {
-        // Layout tests get canned results, not the strings per spec. So testing
+        // Layout tests get canned results, not the value per spec. So testing
         // their values here would only be testing our test plumbing. But we can
-        // test that a string is being returned instead of something else.
-        assert_equals(typeof result, "string", result + " should be a string");
-        assert_greater_than(result.length, 0, "result should have length >0");
+        // test that the type of the returned value is correct.
+        assert_equals(typeof result, "boolean", result + " should be boolean");
     });
 }, "navigator.storage.requestPersistent returns a promise that resolves.");
 

third_party/WebKit/Source/modules/quota/OWNERS

+jsbell@chromium.org
 kinuko@chromium.org
 nhiroki@chromium.org
 tzik@chromium.org

third_party/WebKit/Source/modules/quota/StorageManager.cpp

@@ -18,9 +18,9 @@ namespace blink {
 
 namespace {
 
-class DurableStoragePermissionCallbacks final : public WebCallbacks<WebPermissionStatus*, void> {
+class DurableStorageQueryCallbacks final : public WebCallbacks<WebPermissionStatus*, void> {
 public:
-    DurableStoragePermissionCallbacks(ScriptPromiseResolver* resolver)
+    DurableStorageQueryCallbacks(ScriptPromiseResolver* resolver)
         : m_resolver(resolver)
     {
     }
@@ -51,6 +51,27 @@ private:
     Persistent<ScriptPromiseResolver> m_resolver;
 };
 
+class DurableStorageRequestCallbacks final : public WebCallbacks<WebPermissionStatus*, void> {
+public:
+    DurableStorageRequestCallbacks(ScriptPromiseResolver* resolver)
+        : m_resolver(resolver)
+    {
+    }
+
+    void onSuccess(WebPermissionStatus* rawStatus) override
+    {
+        OwnPtr<WebPermissionStatus> status = adoptPtr(rawStatus);
+        m_resolver->resolve(*status == WebPermissionStatusGranted);
+    }
+    void onError() override
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+private:
+    Persistent<ScriptPromiseResolver> m_resolver;
+};
+
 } // namespace
 
 ScriptPromise StorageManager::requestPersistent(ScriptState* scriptState)
@@ -77,7 +98,7 @@ ScriptPromise StorageManager::requestPersistent(ScriptState* scriptState)
         resolver->reject(DOMException::create(InvalidStateError, "In its current state, the global scope can't request permissions."));
         return promise;
     }
-    permissionClient->requestPermission(WebPermissionTypeDurableStorage, KURL(KURL(), scriptState->executionContext()->securityOrigin()->toString()), new DurableStoragePermissionCallbacks(resolver));
+    permissionClient->requestPermission(WebPermissionTypeDurableStorage, KURL(KURL(), scriptState->executionContext()->securityOrigin()->toString()), new DurableStorageRequestCallbacks(resolver));
 
     return promise;
 }
@@ -91,7 +112,7 @@ ScriptPromise StorageManager::persistentPermission(ScriptState* scriptState)
         resolver->reject(DOMException::create(InvalidStateError, "In its current state, the global scope can't query permissions."));
         return promise;
     }
-    permissionClient->queryPermission(WebPermissionTypeDurableStorage, KURL(KURL(), scriptState->executionContext()->securityOrigin()->toString()), new DurableStoragePermissionCallbacks(resolver));
+    permissionClient->queryPermission(WebPermissionTypeDurableStorage, KURL(KURL(), scriptState->executionContext()->securityOrigin()->toString()), new DurableStorageQueryCallbacks(resolver));
     return promise;
 }
 

third_party/WebKit/Source/modules/quota/StorageManager.idl

@@ -12,7 +12,7 @@ enum PersistentStoragePermission { "default", "denied", "granted" };
     GarbageCollected,
     RuntimeEnabled=DurableStorage,
 ] interface StorageManager {
-    [CallWith=ScriptState] Promise<PersistentStoragePermission> requestPersistent();
+    [CallWith=ScriptState] Promise<boolean> requestPersistent();
     [CallWith=ScriptState] Promise<PersistentStoragePermission> persistentPermission();
 
     // TODO(dgrogan): Implement estimate() and persistentEstimate().