Rename REMOVE_COOKIES to REMOVE_SITE_DATA

chrome/browser/browsing_data_remover.h

Index: chrome/browser/browsing_data_remover.h
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
index 115c0d5d6ab71ca2f709b6ee4ab4433dee545cb0..4f9c56f64cdbaad827a8fa129ee139af2b3795a1 100644
--- a/chrome/browser/browsing_data_remover.h
+++ b/chrome/browser/browsing_data_remover.h
@@ -12,6 +12,7 @@
 #include "base/observer_list.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "base/time.h"
+#include "chrome/browser/prefs/pref_member.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/cancelable_request.h"
 #include "content/common/notification_observer.h"
@@ -56,14 +57,24 @@ class BrowsingDataRemover : public NotificationObserver,
 
   // Mask used for Remove.
   enum RemoveDataMask {
-    // In addition to visits, this removes keywords and the last session.
-    REMOVE_HISTORY = 1 << 0,
-    REMOVE_DOWNLOADS = 1 << 1,
+    REMOVE_CACHE = 1 << 1,

[Bernhard Bauer, 2011/09/05 11:53:01]

Is there a reason you're starting with 1 << 1 now?

[Mike West, 2011/09/05 12:06:14]

Because I'm stupid. :) Fixing.

     REMOVE_COOKIES = 1 << 2,
-    REMOVE_PASSWORDS = 1 << 3,
-    REMOVE_FORM_DATA = 1 << 4,
-    REMOVE_CACHE = 1 << 5,
-    REMOVE_LSO_DATA = 1 << 6,
+    REMOVE_APPCACHE = 1 << 3,
+    REMOVE_DOWNLOADS = 1 << 4,
+    REMOVE_FILE_SYSTEMS = 1 << 5,
+    REMOVE_FORM_DATA = 1 << 6,
+    // In addition to visits, REMOVE_HISTORY removes keywords and last session.
+    REMOVE_HISTORY = 1 << 7,
+    REMOVE_INDEXEDDB = 1 << 8,
+    REMOVE_LOCAL_STORAGE = 1 << 9,
+    REMOVE_LSO_DATA = 1 << 10,
+    REMOVE_PASSWORDS = 1 << 11,
+    REMOVE_WEBSQL = 1 << 12,
+
+    // "Site data" includes cookies, appcache, file systems, indexedDBs, local
+    // storage, webSQL, and LSO data.
+    REMOVE_SITE_DATA = (1 << 2) | (1 << 3) | (1 << 5) | (1 << 8) | (1 << 9) |

[Bernhard Bauer, 2011/09/05 11:53:01]

Can you describe this as an OR'ing of the previous values? Or does the compile
not like it?

[Mike West, 2011/09/05 12:06:14]

I didn't even try that, as I assumed it wouldn't compile. As it turns out, it
does! Much cleaner!

+                       (1 << 10) | (1 << 12)
   };
 
   // Observer is notified when the removal is done. Done means keywords have
@@ -242,6 +253,9 @@ class BrowsingDataRemover : public NotificationObserver,
   // Used if we need to clear history.
   CancelableRequestConsumer request_consumer_;
 
+  // Keeps track of whether clearing LSO data is supported.
+  BooleanPrefMember clear_plugin_lso_data_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };