Changeset 245997 in webkit

Timestamp:

May 31, 2019, 4:25:04 PM (7 years ago)

Author:

Alan Coon

Message:

Revert r245943. rdar://problem/51244662

Location:

branches/safari-608.1.27-branch

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp (modified) (27 diffs)
• Source/WebKit/NetworkProcess/WebStorage/StorageManager.h (modified) (2 diffs)
• Source/WebKit/WebProcess/WebStorage/StorageAreaMap.cpp (modified) (4 diffs)
• Source/WebKit/WebProcess/WebStorage/StorageNamespaceImpl.cpp (modified) (1 diff)
• Source/WebKit/WebProcess/WebStorage/StorageNamespaceImpl.h (modified) (1 diff)
• Source/WebKit/WebProcess/WebStorage/WebStorageNamespaceProvider.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm (modified) (1 diff)

branches/safari-608.1.27-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-31  Alan Coon  <alancoon@apple.com>
+
+        Revert r245943. rdar://problem/51244662
+
 2019-05-31  Alan Coon  <alancoon@apple.com>
 

branches/safari-608.1.27-branch/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp

@@ -64 +64 @@
     void clear();
 
-    bool isEphemeral() const { return !m_localStorageNamespace; }
+    bool isSessionStorage() const { return !m_localStorageNamespace; }
 
 private:
@@ -73 +73 @@
     void dispatchEvents(IPC::Connection::UniqueID sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& oldValue, const String& newValue, const String& urlString) const;
 
-    // Will be null if the storage area belongs to a session storage namespace or the storage area is in an ephemeral session.
+    // Will be null if the storage area belongs to a session storage namespace.
     LocalStorageNamespace* m_localStorageNamespace;
     mutable RefPtr<LocalStorageDatabase> m_localStorageDatabase;
@@ -92 +92 @@
     StorageManager* storageManager() const { return &m_storageManager; }
 
-    enum class IsEphemeral : bool { No, Yes };
-    Ref<StorageArea> getOrCreateStorageArea(SecurityOriginData&&, IsEphemeral);
+    Ref<StorageArea> getOrCreateStorageArea(SecurityOriginData&&);
     void didDestroyStorageArea(StorageArea*);
 
     void clearStorageAreasMatchingOrigin(const SecurityOriginData&);
     void clearAllStorageAreas();
-
-    Vector<SecurityOriginData> ephemeralOrigins() const;
-    void cloneTo(LocalStorageNamespace& newLocalStorageNamespace);
 
 private:
@@ -109 +105 @@
     unsigned m_quotaInBytes;
 
-    HashMap<SecurityOriginData, RefPtr<StorageArea>> m_storageAreaMap;
+    // We don't hold an explicit reference to the StorageAreas; they are kept alive by the m_storageAreasByConnection map in StorageManager.
+    HashMap<SecurityOriginData, StorageArea*> m_storageAreaMap;
 };
 
@@ -200 +197 @@
 void StorageManager::StorageArea::removeListener(IPC::Connection::UniqueID connectionID, uint64_t storageMapID)
 {
-    ASSERT(isEphemeral() || m_eventListeners.contains(std::make_pair(connectionID, storageMapID)));
+    ASSERT(isSessionStorage() || m_eventListeners.contains(std::make_pair(connectionID, storageMapID)));
     m_eventListeners.remove(std::make_pair(connectionID, storageMapID));
 }
@@ -240 +237 @@
 void StorageManager::StorageArea::setItems(const HashMap<String, String>& items)
 {
-    // Import items from web process if items are not stored on disk.
-    if (!isEphemeral())
-        return;
-
+    ASSERT(!m_localStorageDatabase);
     for (auto& item : items) {
         String oldValue;
@@ -318 +312 @@
         return;
 
-    ASSERT(m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker);
     // We open the database here even if we've already imported our items to ensure that the database is open if we need to write to it.
     if (!m_localStorageDatabase)
-        m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue.copyRef(), *m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin);
+        m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue.copyRef(), m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker.copyRef(), m_securityOrigin);
 
     if (m_didImportItemsFromDatabase)
@@ -358 +351 @@
 StorageManager::LocalStorageNamespace::~LocalStorageNamespace()
 {
-}
-
-auto StorageManager::LocalStorageNamespace::getOrCreateStorageArea(SecurityOriginData&& securityOrigin, IsEphemeral isEphemeral) -> Ref<StorageArea>
+    ASSERT(m_storageAreaMap.isEmpty());
+}
+
+auto StorageManager::LocalStorageNamespace::getOrCreateStorageArea(SecurityOriginData&& securityOrigin) -> Ref<StorageArea>
 {
     RefPtr<StorageArea> protectedStorageArea;
     return *m_storageAreaMap.ensure(securityOrigin, [&]() mutable {
-        protectedStorageArea = StorageArea::create(isEphemeral == IsEphemeral::Yes ? nullptr : this, WTFMove(securityOrigin), m_quotaInBytes);
+        protectedStorageArea = StorageArea::create(this, WTFMove(securityOrigin), m_quotaInBytes);
         return protectedStorageArea.get();
     }).iterator->value;
@@ -390 +384 @@
 void StorageManager::LocalStorageNamespace::clearAllStorageAreas()
 {
-    for (auto storageArea : m_storageAreaMap.values())
+    for (auto* storageArea : m_storageAreaMap.values())
         storageArea->clear();
-}
-
-Vector<SecurityOriginData> StorageManager::LocalStorageNamespace::ephemeralOrigins() const
-{
-    Vector<SecurityOriginData> origins;
-    for (const auto& storageArea : m_storageAreaMap.values()) {
-        if (!storageArea->items().isEmpty())
-            origins.append(storageArea->securityOrigin());
-    }
-    return origins;
-}
-
-void StorageManager::LocalStorageNamespace::cloneTo(LocalStorageNamespace& newLocalStorageNamespace)
-{
-    for (auto& pair : m_storageAreaMap)
-        newLocalStorageNamespace.m_storageAreaMap.add(pair.key, pair.value->clone());
 }
 
@@ -506 +484 @@
 StorageManager::StorageManager(const String& localStorageDirectory)
     : m_queue(WorkQueue::create("com.apple.WebKit.StorageManager"))
+    , m_localStorageDatabaseTracker(LocalStorageDatabaseTracker::create(m_queue.copyRef(), localStorageDirectory))
+    , m_isEphemeral(localStorageDirectory.isNull())
 {
     // Make sure the encoding is initialized before we start dispatching things to the queue.
     UTF8Encoding();
-    if (!localStorageDirectory.isNull())
-        m_localStorageDatabaseTracker = LocalStorageDatabaseTracker::create(m_queue.copyRef(), localStorageDirectory);
 }
 
@@ -571 +549 @@
 
         sessionStorageNamespace->cloneTo(*newSessionStorageNamespace);
-
-        if (!m_localStorageDatabaseTracker) {
-            if (auto* localStorageNamespace = m_localStorageNamespaces.get(storageNamespaceID)) {
-                LocalStorageNamespace* newlocalStorageNamespace = getOrCreateLocalStorageNamespace(newStorageNamespaceID);
-                localStorageNamespace->cloneTo(*newlocalStorageNamespace);
-            }
-        }
     });
 }
@@ -659 +630 @@
         HashSet<SecurityOriginData> origins;
 
-        if (m_localStorageDatabaseTracker) {
-            for (auto& origin : m_localStorageDatabaseTracker->origins())
-                origins.add(origin);
-        } else {
-            for (const auto& localStorageNameSpace : m_localStorageNamespaces.values()) {
-                for (auto& origin : localStorageNameSpace->ephemeralOrigins())
-                    origins.add(origin);
-            }
-        }
+        for (auto& origin : m_localStorageDatabaseTracker->origins())
+            origins.add(origin);
 
         for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values()) {
@@ -683 +647 @@
 {
     m_queue->dispatch([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
-        Vector<LocalStorageDatabaseTracker::OriginDetails> originDetails;
-        if (m_localStorageDatabaseTracker)
-            originDetails = m_localStorageDatabaseTracker->originDetails();
+        auto originDetails = m_localStorageDatabaseTracker->originDetails();
 
         RunLoop::main().dispatch([originDetails = WTFMove(originDetails), completionHandler = WTFMove(completionHandler)]() mutable {
@@ -702 +664 @@
             transientLocalStorageNamespace->clearStorageAreasMatchingOrigin(copiedOrigin);
 
-        if (m_localStorageDatabaseTracker)
-            m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(copiedOrigin);
+        m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(copiedOrigin);
     });
 }
@@ -710 +671 @@
 {
     m_queue->dispatch([this, protectedThis = makeRef(*this), time, completionHandler = WTFMove(completionHandler)]() mutable {
-        if (m_localStorageDatabaseTracker) {
-            auto originsToDelete = m_localStorageDatabaseTracker->databasesModifiedSince(time);
+        auto originsToDelete = m_localStorageDatabaseTracker->databasesModifiedSince(time);
+        
+        for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values())
+            transientLocalStorageNamespace->clearAllStorageAreas();
+
+        for (const auto& origin : originsToDelete) {
+            for (auto& localStorageNamespace : m_localStorageNamespaces.values())
+                localStorageNamespace->clearStorageAreasMatchingOrigin(origin);
             
-            for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values())
-                transientLocalStorageNamespace->clearAllStorageAreas();
-
-            for (const auto& origin : originsToDelete) {
-                for (auto& localStorageNamespace : m_localStorageNamespaces.values())
-                    localStorageNamespace->clearStorageAreasMatchingOrigin(origin);
-                
-                m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin);
-            }
-        } else {
-            for (auto& localStorageNamespace : m_localStorageNamespaces.values())
-                localStorageNamespace->clearAllStorageAreas();
+            m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin);
         }
 
@@ -747 +703 @@
                 transientLocalStorageNamespace->clearStorageAreasMatchingOrigin(origin);
 
-            if (m_localStorageDatabaseTracker)
-                m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin);
+            m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin);
         }
 
@@ -758 +713 @@
 {
     m_queue->dispatch([this, protectedThis = makeRef(*this), connectionID = connection.uniqueID(), storageMapID, storageNamespaceID, securityOriginData = securityOriginData.isolatedCopy()]() mutable {
+        ASSERT(!m_isEphemeral);
         std::pair<IPC::Connection::UniqueID, uint64_t> connectionAndStorageMapIDPair(connectionID, storageMapID);
 
@@ -774 +730 @@
         ASSERT(localStorageNamespace);
 
-        auto storageArea = localStorageNamespace->getOrCreateStorageArea(WTFMove(securityOriginData), m_localStorageDatabaseTracker ? StorageManager::LocalStorageNamespace::IsEphemeral::No : StorageManager::LocalStorageNamespace::IsEphemeral::Yes);
+        auto storageArea = localStorageNamespace->getOrCreateStorageArea(WTFMove(securityOriginData));
         storageArea->addListener(connectionID, storageMapID);
 
@@ -793 +749 @@
                 continue;
             Ref<StorageArea> area = *it->value;
-            if (!area->isEphemeral())
+            if (!area->isSessionStorage())
                 continue;
             if (!origin.securityOrigin()->isSameSchemeHostPort(area->securityOrigin().securityOrigin().get()))
@@ -825 +781 @@
 {
     m_queue->dispatch([this, protectedThis = makeRef(*this), connectionID = connection.uniqueID(), storageMapID, storageNamespaceID, securityOriginData = securityOriginData.isolatedCopy()]() mutable {
+        if (m_isEphemeral) {
+            m_ephemeralStorage.add(securityOriginData, WebCore::StorageMap::create(localStorageDatabaseQuotaInBytes));
+            return;
+        }
         // FIXME: This should be a message check.
         ASSERT(m_sessionStorageNamespaces.isValidKey(storageNamespaceID));
@@ -870 +830 @@
 
         // Don't remove session storage maps. The web process may reconnect and expect the data to still be around.
-        if (it->value->isEphemeral())
+        if (it->value->isSessionStorage())
             return;
 
@@ -888 +848 @@
     m_queue->dispatch([this, protectedThis = makeRef(*this), connection = makeRef(connection), securityOriginData = securityOriginData.isolatedCopy(), storageMapID, storageMapSeed, completionHandler = WTFMove(completionHandler)]() mutable {
         auto* storageArea = findStorageArea(connection.get(), storageMapID);
-
-        // This is a session storage area for a page that has already been closed. Ignore it.
-        if (!storageArea)
+        if (!storageArea) {
+            if (m_isEphemeral) {
+                if (auto storageMap = m_ephemeralStorage.get(securityOriginData))
+                    return didGetValues(connection.get(), storageMapID, storageMap->items(), WTFMove(completionHandler));
+            }
+            // This is a session storage area for a page that has already been closed. Ignore it.
             return didGetValues(connection.get(), storageMapID, { }, WTFMove(completionHandler));
-
+        }
         didGetValues(connection.get(), storageMapID, storageArea->items(), WTFMove(completionHandler));
         connection->send(Messages::StorageAreaMap::DidGetValues(storageMapSeed), storageMapID);
@@ -902 +865 @@
     m_queue->dispatch([this, protectedThis = makeRef(*this), connection = makeRef(connection), securityOriginData = securityOriginData.isolatedCopy(), storageMapID, sourceStorageAreaID, storageMapSeed, key = key.isolatedCopy(), value = value.isolatedCopy(), urlString = urlString.isolatedCopy()]() mutable {
         auto* storageArea = findStorageArea(connection.get(), storageMapID);
-
-        // This is a session storage area for a page that has already been closed. Ignore it.
-        if (!storageArea)
-            return;
+        if (!storageArea) {
+            if (m_isEphemeral) {
+                if (auto storageMap = m_ephemeralStorage.get(securityOriginData)) {
+                    String oldValue;
+                    bool quotaException;
+                    storageMap->setItem(key, value, oldValue, quotaException);
+                }
+            }
+            // This is a session storage area for a page that has already been closed. Ignore it.
+            return;
+        }
 
         bool quotaError;
@@ -925 +895 @@
     m_queue->dispatch([this, protectedThis = makeRef(*this), connection = makeRef(connection), securityOriginData = securityOriginData.isolatedCopy(), storageMapID, sourceStorageAreaID, storageMapSeed, key = key.isolatedCopy(), urlString = urlString.isolatedCopy()]() mutable {
         auto* storageArea = findStorageArea(connection.get(), storageMapID);
-
-        // This is a session storage area for a page that has already been closed. Ignore it.
-        if (!storageArea)
-            return;
+        if (!storageArea) {
+            if (m_isEphemeral) {
+                if (auto storageMap = m_ephemeralStorage.get(securityOriginData)) {
+                    String oldValue;
+                    storageMap->removeItem(key, oldValue);
+                }
+            }
+            // This is a session storage area for a page that has already been closed. Ignore it.
+            return;
+        }
 
         storageArea->removeItem(connection->uniqueID(), sourceStorageAreaID, key, urlString);
@@ -939 +915 @@
     m_queue->dispatch([this, protectedThis = makeRef(*this), connection = makeRef(connection), securityOriginData = securityOriginData.isolatedCopy(), storageMapID, sourceStorageAreaID, storageMapSeed, urlString = urlString.isolatedCopy()]() mutable {
         auto* storageArea = findStorageArea(connection.get(), storageMapID);
-
-        // This is a session storage area for a page that has already been closed. Ignore it.
-        if (!storageArea)
-            return;
+        if (!storageArea) {
+            if (m_isEphemeral)
+                m_ephemeralStorage.remove(securityOriginData);
+            // This is a session storage area for a page that has already been closed. Ignore it.
+            return;
+        }
 
         storageArea->clear(connection->uniqueID(), sourceStorageAreaID, urlString);
@@ -969 +947 @@
 void StorageManager::suspend(CompletionHandler<void()>&& completionHandler)
 {
-    if (!m_localStorageDatabaseTracker)
+    if (m_isEphemeral)
         return;
 
@@ -994 +972 @@
 void StorageManager::resume()
 {
-    if (!m_localStorageDatabaseTracker)
+    if (m_isEphemeral)
         return;
 

branches/safari-608.1.27-branch/Source/WebKit/NetworkProcess/WebStorage/StorageManager.h

@@ -104 +104 @@
     Ref<WorkQueue> m_queue;
 
-    RefPtr<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
+    Ref<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
     HashMap<uint64_t, RefPtr<LocalStorageNamespace>> m_localStorageNamespaces;
 
@@ -113 +113 @@
 
     HashMap<std::pair<IPC::Connection::UniqueID, uint64_t>, RefPtr<StorageArea>> m_storageAreasByConnection;
+
+    HashMap<WebCore::SecurityOriginData, Ref<WebCore::StorageMap>> m_ephemeralStorage;
+    bool m_isEphemeral { false };
 
     enum class State {

branches/safari-608.1.27-branch/Source/WebKit/WebProcess/WebStorage/StorageAreaMap.cpp

@@ -295 +295 @@
     }
 
-    if (storageType() == StorageType::Session || storageType() == StorageType::EphemeralLocal)
+    if (storageType() == StorageType::Session)
         dispatchSessionStorageEvent(sourceStorageAreaID, key, oldValue, newValue, urlString);
     else
@@ -308 +308 @@
 void StorageAreaMap::dispatchSessionStorageEvent(uint64_t sourceStorageAreaID, const String& key, const String& oldValue, const String& newValue, const String& urlString)
 {
-    // Namespace IDs for session storage namespaces and ephemeral local storage namespaces are equivalent to web page IDs
+    ASSERT(storageType() == StorageType::Session);
+
+    // Namespace IDs for session storage namespaces are equivalent to web page IDs
     // so we can get the right page here.
     WebPage* webPage = WebProcess::singleton().webPage(makeObjectIdentifier<PageIdentifierType>(m_storageNamespaceID));
@@ -376 +378 @@
     switch (m_storageType) {
     case StorageType::Local:
-    case StorageType::EphemeralLocal:
     case StorageType::TransientLocal:
         if (SecurityOrigin* topLevelOrigin = m_storageNamespace->topLevelOrigin())
@@ -385 +386 @@
     case StorageType::Session:
         WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::StorageManager::CreateSessionStorageMap(m_storageMapID, m_storageNamespace->storageNamespaceID(), m_securityOrigin->data()), 0);
-    }
-
-    if (m_storageMap)
-        WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::StorageManager::SetItems(m_storageMapID, m_storageMap->items()), 0);
+        if (m_storageMap)
+            WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::StorageManager::SetItems(m_storageMapID, m_storageMap->items()), 0);
+        break;
+    case StorageType::EphemeralLocal:
+        ASSERT_NOT_REACHED();
+        return;
+    }
+
     m_isDisconnected = false;
 }

branches/safari-608.1.27-branch/Source/WebKit/WebProcess/WebStorage/StorageNamespaceImpl.cpp

@@ -48 +48 @@
 Ref<StorageNamespaceImpl> StorageNamespaceImpl::createEphemeralLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes)
 {
-    return createLocalStorageNamespace(identifier, quotaInBytes, IsEphemeral::Yes);
+    return createSessionStorageNamespace(identifier, quotaInBytes);
 }
 
-Ref<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes, IsEphemeral isEphemeral)
+Ref<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes)
 {
-    return adoptRef(*new StorageNamespaceImpl(isEphemeral == IsEphemeral::Yes ? StorageType::EphemeralLocal : StorageType::Local, identifier, nullptr, quotaInBytes));
+    return adoptRef(*new StorageNamespaceImpl(StorageType::Local, identifier, nullptr, quotaInBytes));
 }
 

branches/safari-608.1.27-branch/Source/WebKit/WebProcess/WebStorage/StorageNamespaceImpl.h

@@ -42 +42 @@
     static Ref<StorageNamespaceImpl> createSessionStorageNamespace(uint64_t identifier, unsigned quotaInBytes);
     static Ref<StorageNamespaceImpl> createEphemeralLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes);
-
-    enum class IsEphemeral : bool { No, Yes };
-    static Ref<StorageNamespaceImpl> createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes, IsEphemeral isEphemeral);
+    static Ref<StorageNamespaceImpl> createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes);
     static Ref<StorageNamespaceImpl> createTransientLocalStorageNamespace(uint64_t identifier, WebCore::SecurityOrigin& topLevelOrigin, uint64_t quotaInBytes);
 

branches/safari-608.1.27-branch/Source/WebKit/WebProcess/WebStorage/WebStorageNamespaceProvider.cpp

@@ -78 +78 @@
 Ref<WebCore::StorageNamespace> WebStorageNamespaceProvider::createLocalStorageNamespace(unsigned quota)
 {
-    return StorageNamespaceImpl::createLocalStorageNamespace(m_identifier, quota, StorageNamespaceImpl::IsEphemeral::No);
+    return StorageNamespaceImpl::createLocalStorageNamespace(m_identifier, quota);
 }
 

branches/safari-608.1.27-branch/Tools/ChangeLog

@@ +1 @@
+2019-05-31  Alan Coon  <alancoon@apple.com>
+
+        Revert r245943. rdar://problem/51244662
+
 2019-05-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

branches/safari-608.1.27-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm

@@ -305 +305 @@
 }
 
-TEST(WKWebsiteDataStore, FetchNonPersistentWebStorage)
-{
-    auto nonPersistentDataStore = [WKWebsiteDataStore nonPersistentDataStore];
-    auto configuration = adoptNS([WKWebViewConfiguration new]);
-    [configuration setWebsiteDataStore:nonPersistentDataStore];
-    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
-    auto navigationDelegate = adoptNS([[NavigationTestDelegate alloc] init]);
-    [webView setNavigationDelegate:navigationDelegate.get()];
-    [webView loadHTMLString:@"<script>sessionStorage.setItem('session', 'storage');localStorage.setItem('local', 'storage');</script>" baseURL:[NSURL URLWithString:@"http://localhost"]];
-    [navigationDelegate waitForDidFinishNavigation];
-
-    readyToContinue = false;
-    [webView evaluateJavaScript:@"window.sessionStorage.getItem('session')" completionHandler:^(id result, NSError *) {
-        EXPECT_TRUE([@"storage" isEqualToString:result]);
-        readyToContinue = true;
-    }];
-    TestWebKitAPI::Util::run(&readyToContinue);
-
-    readyToContinue = false;
-    [webView evaluateJavaScript:@"window.localStorage.getItem('local')" completionHandler:^(id result, NSError *) {
-        EXPECT_TRUE([@"storage" isEqualToString:result]);
-        readyToContinue = true;
-    }];
-    TestWebKitAPI::Util::run(&readyToContinue);
-
-    readyToContinue = false;
-    [nonPersistentDataStore fetchDataRecordsOfTypes:[NSSet setWithObject:WKWebsiteDataTypeSessionStorage] completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
-        EXPECT_EQ((int)dataRecords.count, 1);
-        EXPECT_TRUE([[[dataRecords objectAtIndex:0] displayName] isEqualToString:@"localhost"]);
-        readyToContinue = true;
-    }];
-    TestWebKitAPI::Util::run(&readyToContinue);
-
-    readyToContinue = false;
-    [nonPersistentDataStore fetchDataRecordsOfTypes:[NSSet setWithObject:WKWebsiteDataTypeLocalStorage] completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
-        EXPECT_EQ((int)dataRecords.count, 1);
-        EXPECT_TRUE([[[dataRecords objectAtIndex:0] displayName] isEqualToString:@"localhost"]);
-        readyToContinue = true;
-    }];
-    TestWebKitAPI::Util::run(&readyToContinue);
-}
-
-}
+}