Convert BrowsingDataCookieHelper to use CookieManager

Make BrowsingDataCookieHelper compatible with the network service
by converting it to use CookieManager.

Bug: 843995
Change-Id: I92db772d7ab63ca51fbaabd618f6b4d77fd784b3
Reviewed-on: https://chromium-review.googlesource.com/1101022
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568007}

chrome/browser/android/preferences/website_preference_bridge.cc

@@ -624,7 +624,7 @@ class SiteDataDeleteHelper : public CookiesTreeModel::Observer {
     storage::FileSystemContext* file_system_context =
         storage_partition->GetFileSystemContext();
     auto container = std::make_unique<LocalDataContainer>(
-        new BrowsingDataCookieHelper(profile_->GetRequestContext()),
+        new BrowsingDataCookieHelper(storage_partition),
         new BrowsingDataDatabaseHelper(profile_),
         new BrowsingDataLocalStorageHelper(profile_), nullptr,
         new BrowsingDataAppCacheHelper(profile_),

chrome/browser/browsing_data/browsing_data_cookie_helper.cc

@@ -12,6 +12,7 @@
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_util.h"
@@ -23,23 +24,12 @@
 using content::BrowserThread;
 
 namespace {
-
 const char kGlobalCookieSetURL[] = "chrome://cookieset";
-
-void OnCookieFetchComplete(
-    const BrowsingDataCookieHelper::FetchCallback& callback,
-    const net::CookieList& cookies) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(!callback.is_null());
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                          base::BindOnce(callback, cookies));
-}
-
 }  // namespace
 
 BrowsingDataCookieHelper::BrowsingDataCookieHelper(
-    net::URLRequestContextGetter* request_context_getter)
-    : request_context_getter_(request_context_getter) {
+    content::StoragePartition* storage_partition)
+    : storage_partition_(storage_partition) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
@@ -49,42 +39,20 @@ BrowsingDataCookieHelper::~BrowsingDataCookieHelper() {
 void BrowsingDataCookieHelper::StartFetching(const FetchCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::BindOnce(&BrowsingDataCookieHelper::FetchCookiesOnIOThread, this,
-                     callback));
+  storage_partition_->GetCookieManagerForBrowserProcess()->GetAllCookies(
+      callback);
 }
 
 void BrowsingDataCookieHelper::DeleteCookie(
     const net::CanonicalCookie& cookie) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::BindOnce(&BrowsingDataCookieHelper::DeleteCookieOnIOThread, this,
-                     cookie));
-}
-
-void BrowsingDataCookieHelper::FetchCookiesOnIOThread(
-    const FetchCallback& callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(!callback.is_null());
-  request_context_getter_->GetURLRequestContext()
-      ->cookie_store()
-      ->GetAllCookiesAsync(base::BindOnce(&OnCookieFetchComplete, callback));
-}
-
-void BrowsingDataCookieHelper::DeleteCookieOnIOThread(
-    const net::CanonicalCookie& cookie) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  request_context_getter_->GetURLRequestContext()->cookie_store()->
-      DeleteCanonicalCookieAsync(
-          cookie, net::CookieStore::DeleteCallback());
+  storage_partition_->GetCookieManagerForBrowserProcess()
+      ->DeleteCanonicalCookie(cookie, base::DoNothing());
 }
 
 CannedBrowsingDataCookieHelper::CannedBrowsingDataCookieHelper(
-    net::URLRequestContextGetter* request_context_getter)
-    : BrowsingDataCookieHelper(request_context_getter) {
-}
+    content::StoragePartition* storage_partition)
+    : BrowsingDataCookieHelper(storage_partition) {}
 
 CannedBrowsingDataCookieHelper::~CannedBrowsingDataCookieHelper() {
   Reset();

chrome/browser/browsing_data/browsing_data_cookie_helper.h

@@ -20,7 +20,9 @@ class GURL;
 
 namespace net {
 class CanonicalCookie;
-class URLRequestContextGetter;
+}
+namespace content {
+class StoragePartition;
 }
 
 // This class fetches cookie information on behalf of a caller
@@ -33,7 +35,7 @@ class BrowsingDataCookieHelper
  public:
   using FetchCallback = base::Callback<void(const net::CookieList&)>;
   explicit BrowsingDataCookieHelper(
-      net::URLRequestContextGetter* request_context_getter);
+      content::StoragePartition* storage_partition);
 
   // Starts the fetching process, which will notify its completion via
   // callback.
@@ -48,18 +50,8 @@ class BrowsingDataCookieHelper
   friend class base::RefCountedThreadSafe<BrowsingDataCookieHelper>;
   virtual ~BrowsingDataCookieHelper();
 
-  net::URLRequestContextGetter* request_context_getter() {
-    return request_context_getter_.get();
-  }
-
  private:
-  // Fetch the cookies. This must be called in the IO thread.
-  void FetchCookiesOnIOThread(const FetchCallback& callback);
-
-  // Delete a single cookie. This must be called in IO thread.
-  void DeleteCookieOnIOThread(const net::CanonicalCookie& cookie);
-
-  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
+  content::StoragePartition* storage_partition_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataCookieHelper);
 };
@@ -82,7 +74,7 @@ class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
       OriginCookieSetMap;
 
   explicit CannedBrowsingDataCookieHelper(
-      net::URLRequestContextGetter* request_context);
+      content::StoragePartition* storage_partition);
 
   // Adds the cookies from |cookie_list|. Current cookies that have the same
   // cookie name, cookie domain, cookie path, host-only-flag tuple as passed

chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc

@@ -195,6 +195,11 @@ class BrowsingDataCookieHelperTest : public testing::Test {
     }
   }
 
+  content::StoragePartition* storage_partition() {
+    return content::BrowserContext::GetDefaultStoragePartition(
+        testing_profile_.get());
+  }
+
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<TestingProfile> testing_profile_;
@@ -206,7 +211,7 @@ class BrowsingDataCookieHelperTest : public testing::Test {
 TEST_F(BrowsingDataCookieHelperTest, FetchData) {
   CreateCookiesForTest();
   scoped_refptr<BrowsingDataCookieHelper> cookie_helper(
-      new BrowsingDataCookieHelper(testing_profile_->GetRequestContext()));
+      new BrowsingDataCookieHelper(storage_partition()));
 
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::FetchCallback,
@@ -217,7 +222,7 @@ TEST_F(BrowsingDataCookieHelperTest, FetchData) {
 TEST_F(BrowsingDataCookieHelperTest, DomainCookie) {
   CreateCookiesForDomainCookieTest();
   scoped_refptr<BrowsingDataCookieHelper> cookie_helper(
-      new BrowsingDataCookieHelper(testing_profile_->GetRequestContext()));
+      new BrowsingDataCookieHelper(storage_partition()));
 
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::DomainCookieCallback,
@@ -228,7 +233,7 @@ TEST_F(BrowsingDataCookieHelperTest, DomainCookie) {
 TEST_F(BrowsingDataCookieHelperTest, DeleteCookie) {
   CreateCookiesForTest();
   scoped_refptr<BrowsingDataCookieHelper> cookie_helper(
-      new BrowsingDataCookieHelper(testing_profile_->GetRequestContext()));
+      new BrowsingDataCookieHelper(storage_partition()));
 
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::FetchCallback,
@@ -247,8 +252,7 @@ TEST_F(BrowsingDataCookieHelperTest, DeleteCookie) {
 TEST_F(BrowsingDataCookieHelperTest, CannedDeleteCookie) {
   CreateCookiesForTest();
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
-      new CannedBrowsingDataCookieHelper(
-          testing_profile_->GetRequestContext()));
+      new CannedBrowsingDataCookieHelper(storage_partition()));
 
   ASSERT_TRUE(helper->empty());
 
@@ -284,8 +288,7 @@ TEST_F(BrowsingDataCookieHelperTest, CannedDomainCookie) {
   net::CookieList cookie;
 
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
-      new CannedBrowsingDataCookieHelper(
-          testing_profile_->GetRequestContext()));
+      new CannedBrowsingDataCookieHelper(storage_partition()));
 
   ASSERT_TRUE(helper->empty());
   std::unique_ptr<net::CanonicalCookie> cookie1(net::CanonicalCookie::Create(
@@ -316,8 +319,7 @@ TEST_F(BrowsingDataCookieHelperTest, CannedUnique) {
   const GURL origin("http://www.google.com");
 
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
-      new CannedBrowsingDataCookieHelper(
-          testing_profile_->GetRequestContext()));
+      new CannedBrowsingDataCookieHelper(storage_partition()));
 
   ASSERT_TRUE(helper->empty());
   std::unique_ptr<net::CanonicalCookie> cookie(net::CanonicalCookie::Create(
@@ -344,8 +346,7 @@ TEST_F(BrowsingDataCookieHelperTest, CannedReplaceCookie) {
   const GURL origin("http://www.google.com");
 
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
-      new CannedBrowsingDataCookieHelper(
-          testing_profile_->GetRequestContext()));
+      new CannedBrowsingDataCookieHelper(storage_partition()));
 
   ASSERT_TRUE(helper->empty());
   std::unique_ptr<net::CanonicalCookie> cookie1(net::CanonicalCookie::Create(
@@ -415,8 +416,7 @@ TEST_F(BrowsingDataCookieHelperTest, CannedEmpty) {
   const GURL url_google("http://www.google.com");
 
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
-      new CannedBrowsingDataCookieHelper(
-          testing_profile_->GetRequestContext()));
+      new CannedBrowsingDataCookieHelper(storage_partition()));
 
   ASSERT_TRUE(helper->empty());
   std::unique_ptr<net::CanonicalCookie> changed_cookie(
@@ -446,8 +446,7 @@ TEST_F(BrowsingDataCookieHelperTest, CannedDifferentFrames) {
   GURL request_url("http://www.google.com");
 
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
-      new CannedBrowsingDataCookieHelper(
-          testing_profile_->GetRequestContext()));
+      new CannedBrowsingDataCookieHelper(storage_partition()));
 
   ASSERT_TRUE(helper->empty());
   std::unique_ptr<net::CanonicalCookie> cookie1(net::CanonicalCookie::Create(
@@ -479,8 +478,7 @@ TEST_F(BrowsingDataCookieHelperTest, CannedGetCookieCount) {
   std::string cookie_domain(".www.google.com");
 
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
-      new CannedBrowsingDataCookieHelper(
-          testing_profile_->GetRequestContext()));
+      new CannedBrowsingDataCookieHelper(storage_partition()));
 
   // Add two different cookies (distinguished by the tuple [cookie-name,
   // domain-value, path-value]) for a HTTP request to |frame1_url| and verify

chrome/browser/browsing_data/cookies_tree_model_unittest.cc

@@ -61,7 +61,7 @@ class CookiesTreeModelTest : public testing::Test {
   void SetUp() override {
     profile_.reset(new TestingProfile());
     mock_browsing_data_cookie_helper_ =
-        new MockBrowsingDataCookieHelper(profile_->GetRequestContext());
+        new MockBrowsingDataCookieHelper(profile_.get());
     mock_browsing_data_database_helper_ =
         new MockBrowsingDataDatabaseHelper(profile_.get());
     mock_browsing_data_local_storage_helper_ =

chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc

@@ -9,13 +9,14 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
+#include "chrome/browser/profiles/profile.h"
+#include "content/public/browser/browser_context.h"
 #include "net/cookies/cookie_options.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-MockBrowsingDataCookieHelper::MockBrowsingDataCookieHelper(
-    net::URLRequestContextGetter* request_context_getter)
-    : BrowsingDataCookieHelper(request_context_getter) {
-}
+MockBrowsingDataCookieHelper::MockBrowsingDataCookieHelper(Profile* profile)
+    : BrowsingDataCookieHelper(
+          content::BrowserContext::GetDefaultStoragePartition(profile)) {}
 
 MockBrowsingDataCookieHelper::~MockBrowsingDataCookieHelper() {
 }

chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h

@@ -12,11 +12,12 @@
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "net/cookies/canonical_cookie.h"
 
+class Profile;
+
 // Mock for BrowsingDataCookieHelper.
 class MockBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
  public:
-  explicit MockBrowsingDataCookieHelper(
-      net::URLRequestContextGetter* request_context_getter);
+  explicit MockBrowsingDataCookieHelper(Profile* profile);
 
   // BrowsingDataCookieHelper methods.
   void StartFetching(const FetchCallback& callback) override;

chrome/browser/browsing_data/site_data_size_collector_unittest.cc

@@ -43,7 +43,7 @@ class SiteDataSizeCollectorTest : public testing::Test {
   void SetUp() override {
     profile_.reset(new TestingProfile());
     mock_browsing_data_cookie_helper_ =
-        new MockBrowsingDataCookieHelper(profile_->GetRequestContext());
+        new MockBrowsingDataCookieHelper(profile_.get());
     mock_browsing_data_database_helper_ =
         new MockBrowsingDataDatabaseHelper(profile_.get());
     mock_browsing_data_local_storage_helper_ =

chrome/browser/content_settings/local_shared_objects_container.cc

@@ -38,8 +38,8 @@ bool SameDomainOrHost(const GURL& gurl1, const GURL& gurl2) {
 LocalSharedObjectsContainer::LocalSharedObjectsContainer(Profile* profile)
     : appcaches_(new CannedBrowsingDataAppCacheHelper(profile)),
       channel_ids_(new CannedBrowsingDataChannelIDHelper()),
-      cookies_(
-          new CannedBrowsingDataCookieHelper(profile->GetRequestContext())),
+      cookies_(new CannedBrowsingDataCookieHelper(
+          content::BrowserContext::GetDefaultStoragePartition(profile))),
       databases_(new CannedBrowsingDataDatabaseHelper(profile)),
       file_systems_(new CannedBrowsingDataFileSystemHelper(profile)),
       indexed_dbs_(new CannedBrowsingDataIndexedDBHelper(

chrome/browser/sessions/session_data_deleter.cc

@@ -104,8 +104,6 @@ void SessionDataDeleter::Run(content::StoragePartition* storage_partition) {
 
 void SessionDataDeleter::DeleteSessionOnlyOriginCookies(
     const std::vector<net::CanonicalCookie>& cookies) {
-  base::Time yesterday(base::Time::Now() - base::TimeDelta::FromDays(1));
-
   auto delete_cookie_predicate =
       storage_policy_->CreateDeleteCookieOnExitPredicate();
   DCHECK(delete_cookie_predicate);
@@ -114,17 +112,8 @@ void SessionDataDeleter::DeleteSessionOnlyOriginCookies(
     if (!delete_cookie_predicate.Run(cookie.Domain(), cookie.IsSecure())) {
       continue;
     }
-
-    // Delete a single cookie by setting its expiration time into the past.
-    cookie_manager_->SetCanonicalCookie(
-        net::CanonicalCookie(cookie.Name(), cookie.Value(), cookie.Domain(),
-                             cookie.Path(), cookie.CreationDate(), yesterday,
-                             cookie.LastAccessDate(), cookie.IsSecure(),
-                             cookie.IsHttpOnly(), cookie.SameSite(),
-                             cookie.Priority()),
-        true /* secure_source */, true /* modify_http_only */,
-        // Fire and forget
-        network::mojom::CookieManager::SetCanonicalCookieCallback());
+    // Fire and forget.
+    cookie_manager_->DeleteCanonicalCookie(cookie, base::DoNothing());
   }
 }
 

chrome/browser/ui/webui/settings/chromeos/device_storage_handler.cc

@@ -244,7 +244,7 @@ void StorageHandler::UpdateBrowsingDataSize() {
         content::BrowserContext::GetDefaultStoragePartition(profile);
     site_data_size_collector_.reset(new SiteDataSizeCollector(
         storage_partition->GetPath(),
-        new BrowsingDataCookieHelper(profile->GetRequestContext()),
+        new BrowsingDataCookieHelper(storage_partition),
         new BrowsingDataDatabaseHelper(profile),
         new BrowsingDataLocalStorageHelper(profile),
         new BrowsingDataAppCacheHelper(profile),

chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc

@@ -269,7 +269,7 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
     storage::FileSystemContext* file_system_context =
         storage_partition->GetFileSystemContext();
     auto container = std::make_unique<LocalDataContainer>(
-        new BrowsingDataCookieHelper(profile->GetRequestContext()),
+        new BrowsingDataCookieHelper(storage_partition),
         new BrowsingDataDatabaseHelper(profile),
         new BrowsingDataLocalStorageHelper(profile),
         /*session_storage_helper=*/nullptr,

content/browser/devtools/protocol/network_handler.cc

@@ -382,8 +382,6 @@ void DeleteFilteredCookies(network::mojom::CookieManager* cookie_manager,
                            const std::string& path,
                            std::unique_ptr<DeleteCookiesCallback> callback,
                            const std::vector<net::CanonicalCookie>& cookies) {
-  base::Time yesterday(base::Time::Now() - base::TimeDelta::FromDays(1));
-
   std::vector<net::CanonicalCookie> filtered_list =
       FilterCookies(cookies, name, normalized_domain, path);
 
@@ -392,17 +390,10 @@ void DeleteFilteredCookies(network::mojom::CookieManager* cookie_manager,
       base::BindOnce(&DeleteCookiesCallback::sendSuccess, std::move(callback)));
 
   for (auto& cookie : filtered_list) {
-    // Delete a single cookie by setting its expiration time into the past.
-    cookie_manager->SetCanonicalCookie(
-        net::CanonicalCookie(cookie.Name(), cookie.Value(), cookie.Domain(),
-                             cookie.Path(), cookie.CreationDate(), yesterday,
-                             cookie.LastAccessDate(), cookie.IsSecure(),
-                             cookie.IsHttpOnly(), cookie.SameSite(),
-                             cookie.Priority()),
-        true /* secure_source */, true /* modify_http_only */,
-        base::BindOnce(
-            [](base::RepeatingClosure callback, bool) { callback.Run(); },
-            barrier_closure));
+    cookie_manager->DeleteCanonicalCookie(
+        cookie, base::BindOnce([](base::RepeatingClosure callback,
+                                  bool) { callback.Run(); },
+                               barrier_closure));
   }
 }
 

services/network/cookie_manager.cc

@@ -94,6 +94,18 @@ void CookieManager::SetCanonicalCookie(const net::CanonicalCookie& cookie,
       modify_http_only, std::move(callback));
 }
 
+void CookieManager::DeleteCanonicalCookie(
+    const net::CanonicalCookie& cookie,
+    DeleteCanonicalCookieCallback callback) {
+  cookie_store_->DeleteCanonicalCookieAsync(
+      cookie,
+      base::BindOnce(
+          [](DeleteCanonicalCookieCallback callback, uint32_t num_deleted) {
+            std::move(callback).Run(num_deleted > 0);
+          },
+          std::move(callback)));
+}
+
 void CookieManager::SetContentSettings(
     const ContentSettingsForOneType& settings) {
   cookie_settings_.set_content_settings(settings);

services/network/cookie_manager.h

@@ -59,6 +59,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) CookieManager
                           bool secure_source,
                           bool modify_http_only,
                           SetCanonicalCookieCallback callback) override;
+  void DeleteCanonicalCookie(const net::CanonicalCookie& cookie,
+                             DeleteCanonicalCookieCallback callback) override;
   void SetContentSettings(const ContentSettingsForOneType& settings) override;
   void DeleteCookies(mojom::CookieDeletionFilterPtr filter,
                      DeleteCookiesCallback callback) override;

services/network/cookie_manager_unittest.cc

@@ -102,6 +102,16 @@ class SynchronousCookieManager {
     return result;
   }
 
+  bool DeleteCanonicalCookie(const net::CanonicalCookie& cookie) {
+    base::RunLoop run_loop;
+    bool result;
+    cookie_service_->DeleteCanonicalCookie(
+        cookie, base::BindOnce(&SynchronousCookieManager::SetCookieCallback,
+                               &run_loop, &result));
+    run_loop.Run();
+    return result;
+  }
+
   uint32_t DeleteCookies(mojom::CookieDeletionFilter filter) {
     base::RunLoop run_loop;
     uint32_t num_deleted = 0u;
@@ -513,6 +523,20 @@ TEST_F(CookieManagerTest, GetCookieListAccessTime) {
   EXPECT_LE(cookies[0].LastAccessDate(), base::Time::Now());
 }
 
+TEST_F(CookieManagerTest, DeleteCanonicalCookie) {
+  EXPECT_TRUE(SetCanonicalCookie(
+      net::CanonicalCookie(
+          "A", "B", "foo_host", "/", base::Time(), base::Time(), base::Time(),
+          /*secure=*/false, /*httponly=*/false,
+          net::CookieSameSite::NO_RESTRICTION, net::COOKIE_PRIORITY_MEDIUM),
+      true, true));
+  std::vector<net::CanonicalCookie> cookies =
+      service_wrapper()->GetAllCookies();
+  ASSERT_EQ(1U, cookies.size());
+  EXPECT_TRUE(service_wrapper()->DeleteCanonicalCookie(cookies[0]));
+  EXPECT_EQ(0U, service_wrapper()->GetAllCookies().size());
+}
+
 TEST_F(CookieManagerTest, DeleteThroughSet) {
   // Set some cookies for the test to play with.
   EXPECT_TRUE(SetCanonicalCookie(

services/network/public/mojom/cookie_manager.mojom

@@ -171,9 +171,10 @@ interface CookieManager {
       CanonicalCookie cookie, bool secure_source, bool modify_http_only) =>
       (bool success);
 
+  // Delete a cookie. Returns true if a cookie was deleted.
+  DeleteCanonicalCookie(CanonicalCookie cookie) => (bool success);
+
   // Delete a set of cookies matching the passed filter.
-  // To delete a single cookie, use SetCanonicalCookie with an expiry
-  // time in the past.
   // Returns the number of cookies deleted.
   DeleteCookies(CookieDeletionFilter filter) => (uint32 num_deleted);