Delete cookies for site when deleting locally stored data.

chrome/browser/android/preferences/website_preference_bridge.cc

Index: chrome/browser/android/preferences/website_preference_bridge.cc
diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc
index 4ea9e47f788bd958f75a31abebbf9c097eb9fa10..515b43e82181dc7b69c24f220af265b478dbc159 100644
--- a/chrome/browser/android/preferences/website_preference_bridge.cc
+++ b/chrome/browser/android/preferences/website_preference_bridge.cc
@@ -12,6 +12,8 @@
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/cookies_tree_model.h"
+#include "chrome/browser/browsing_data/local_data_container.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -285,6 +287,104 @@ static void SetCookieSettingForOrigin(JNIEnv* env, jclass clazz,
 
 namespace {
 
+class SiteDataDeleteHelper :
+      public base::RefCountedThreadSafe<SiteDataDeleteHelper>,
+      public CookiesTreeModel::Observer {
+ public:
+  SiteDataDeleteHelper(Profile* profile, const GURL& domain)
+      : profile_(profile), domain_(domain), ending_batch_processing_(false) {
+  }
+
+  void Run() {
+    AddRef();  // Balanced in TreeModelEndBatch.
+
+    content::StoragePartition* storage_partition =
+        content::BrowserContext::GetDefaultStoragePartition(profile_);
+    content::IndexedDBContext* indexed_db_context =
+        storage_partition->GetIndexedDBContext();
+    content::ServiceWorkerContext* service_worker_context =
+        storage_partition->GetServiceWorkerContext();
+    storage::FileSystemContext* file_system_context =
+        storage_partition->GetFileSystemContext();
+    LocalDataContainer* container = new LocalDataContainer(
+        new BrowsingDataCookieHelper(profile_->GetRequestContext()),
+        new BrowsingDataDatabaseHelper(profile_),
+        new BrowsingDataLocalStorageHelper(profile_),
+        NULL,
+        new BrowsingDataAppCacheHelper(profile_),
+        new BrowsingDataIndexedDBHelper(indexed_db_context),
+        BrowsingDataFileSystemHelper::Create(file_system_context),
+        BrowsingDataQuotaHelper::Create(profile_),
+        BrowsingDataChannelIDHelper::Create(profile_->GetRequestContext()),
+        new BrowsingDataServiceWorkerHelper(service_worker_context),
+        NULL);
+
+    cookies_tree_model_.reset(new CookiesTreeModel(
+        container, profile_->GetExtensionSpecialStoragePolicy(), false));
+    cookies_tree_model_->AddCookiesTreeObserver(this);
+  }
+
+  // TreeModelObserver:
+  void TreeNodesAdded(ui::TreeModel* model,
+                              ui::TreeModelNode* parent,
+                              int start,
+                              int count) override {}
+  void TreeNodesRemoved(ui::TreeModel* model,
+                                ui::TreeModelNode* parent,
+                                int start,
+                                int count) override {}
+
+  // CookiesTreeModel::Observer:
+  void TreeNodeChanged(ui::TreeModel* model, ui::TreeModelNode* node) override {
+  }
+
+  void TreeModelBeginBatch(CookiesTreeModel* model) override {
+    DCHECK(!ending_batch_processing_);  // Extra batch-start sent.
+  }
+
+  void TreeModelEndBatch(CookiesTreeModel* model) override {

[newt (away), 2015/01/23 02:23:14]

It's not clear to me that TreeModelEndBatch is guaranteed to be called exactly
once, but that's mainly because I don't know anything about CookiesTreeModel.

[Finnur, 2015/01/26 10:47:22]

Incidentally, I've become intimately familiar with that logic, since it was
designed to send only one event (with DCHECKs in the Desktop UI) but due to a
bug (that I'm also fixing in this CL and Mike reviewed), it wasn't working (was
sending the event twice).

+    DCHECK(!ending_batch_processing_);  // Already in end-stage.
+    ending_batch_processing_ = true;
+
+    RecursivelyFindSiteAndDelete(cookies_tree_model_->GetRoot());
+
+    // This will result in this class getting deleted.
+    Release();
+  }
+
+  void RecursivelyFindSiteAndDelete(CookieTreeNode* node) {
+    CookieTreeNode::DetailedInfo info = node->GetDetailedInfo();
+    bool delete_this_node = false;
+    if (info.node_type == CookieTreeNode::DetailedInfo::TYPE_COOKIE &&
+        info.cookie &&
+        domain_.DomainIs(info.cookie->Domain().c_str()))
+      delete_this_node = true;
+
+    for (int i = node->child_count(); i > 0; --i)

[newt (away), 2015/01/23 02:23:14]

Why can't you move this for loop up to before the first if statement?

[Finnur, 2015/01/26 10:47:22]

At one point I needed to delete last, but then managed to simplify the code and
get rid of that requirement. Never revisited this, but now I have. Thanks! This
simplifies things a bit.

+      RecursivelyFindSiteAndDelete(node->GetChild(i - 1));

[newt (away), 2015/01/23 02:23:14]

Can COOKIE nodes contain other COOKIE nodes?

[Finnur, 2015/01/26 10:47:22]

I don't believe so. What I see is a tree that looks like this:

Root
  - Host
    - Cookies
      - Cookie A
      - Cookie B
      - Cookie C
  - Host
    - Cookies
      - Cookie D
      - Cookie E
      - Cookie F
  - Host
    - ...

There always seems to be a COOKIES (plural) node, containing leaf nodes of type
COOKIE (singular). This is pretty typical for all the data, AppCache has
AppCaches, LocalStorage has LocalStorages, etc.

+
+    if (delete_this_node)
+      cookies_tree_model_->DeleteCookieNode(node);
+  }
+
+ private:
+  friend class base::RefCountedThreadSafe<SiteDataDeleteHelper>;
+
+  virtual ~SiteDataDeleteHelper() {}
+
+  Profile* profile_;
+
+  // The domain we want to delete data for.
+  GURL domain_;
+
+  // Keeps track of when we're ready to close batch processing.
+  bool ending_batch_processing_;
+
+  scoped_ptr<CookiesTreeModel> cookies_tree_model_;
+
+  DISALLOW_COPY_AND_ASSIGN(SiteDataDeleteHelper);
+};
+
 class StorageInfoFetcher :
       public base::RefCountedThreadSafe<StorageInfoFetcher> {
  public:
@@ -500,6 +600,14 @@ static void ClearStorageData(JNIEnv* env,
   storage_data_deleter->Run();
 }
 
+static void ClearCookieData(JNIEnv* env, jclass clazz, jstring jorigin) {
+  Profile* profile = ProfileManager::GetActiveUserProfile();
+  GURL url(ConvertJavaStringToUTF8(env, jorigin));
+  scoped_refptr<SiteDataDeleteHelper> site_data_deleter(
+      new SiteDataDeleteHelper(profile, url));
+  site_data_deleter->Run();
+}
+
 // Register native methods
 bool RegisterWebsitePreferenceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);