Clear webapp storage when site data is cleared

chrome/browser/browsing_data/browsing_data_remover.h

Index: chrome/browser/browsing_data/browsing_data_remover.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 0333d9fe2762e0d9be5661b4489e6b53842ef0af..09384310b27fdbdf63728342a69f877bb38664b3 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -82,13 +82,15 @@ class BrowsingDataRemover
     REMOVE_NOCHECKS = 1 << 16,
     REMOVE_WEBRTC_IDENTITY = 1 << 17,
     REMOVE_CACHE_STORAGE = 1 << 18,
+    REMOVE_WEBAPP_DATA = 1 << 19,

[Bernhard Bauer, 2015/09/10 09:46:24]

Would it make sense to only define this on Android?

[Lalit Maganti, 2015/09/10 10:01:38]

I guess it would actually. Changing the REMOVE_SITE_DATA to be ifdeffed might
prove a bit tricky with the formatting though.

Also other constants (e.g. REMOVE_PLUGIN_DATA) are used in only in ifdeffed
regions of code (e.g. ENABLE_PLUGINS) so there should be no harm in leaving as
is.

     // The following flag is used only in tests. In normal usage, hosted app
     // data is controlled by the REMOVE_COOKIES flag, applied to the
     // protected-web origin.
     REMOVE_HOSTED_APP_DATA_TESTONLY = 1 << 31,
 
     // "Site data" includes cookies, appcache, file systems, indexedDBs, local
-    // storage, webSQL, service workers, cache storage, and plugin data.
+    // storage, webSQL, service workers, cache storage, plugin data, and webapp
+    // data.
     REMOVE_SITE_DATA = REMOVE_APPCACHE | REMOVE_COOKIES | REMOVE_FILE_SYSTEMS |
                        REMOVE_INDEXEDDB |
                        REMOVE_LOCAL_STORAGE |
@@ -98,7 +100,8 @@ class BrowsingDataRemover
                        REMOVE_WEBSQL |
                        REMOVE_CHANNEL_IDS |
                        REMOVE_SITE_USAGE_DATA |
-                       REMOVE_WEBRTC_IDENTITY,
+                       REMOVE_WEBRTC_IDENTITY |
+                       REMOVE_WEBAPP_DATA,
 
     // Includes all the available remove options. Meant to be used by clients
     // that wish to wipe as much data as possible from a Profile, to make it
@@ -386,6 +389,9 @@ class BrowsingDataRemover
 #if defined(OS_ANDROID)
   // Callback on UI thread when the precache history has been cleared.
   void OnClearedPrecacheHistory();
+
+  // Callback on UI thread when the webapp data has been cleared.
+  void OnClearedWebappData();
 #endif
 
   void OnClearedDomainReliabilityMonitor();
@@ -446,6 +452,7 @@ class BrowsingDataRemover
   bool waiting_for_clear_pnacl_cache_ = false;
 #if defined(OS_ANDROID)
   bool waiting_for_clear_precache_history_ = false;
+  bool waiting_for_clear_webapp_data_ = false;
 #endif
   bool waiting_for_clear_storage_partition_data_ = false;
 #if defined(ENABLE_WEBRTC)