Teaching BrowsingDataRemover how to delete application data.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 9735799ef662e9a4e7bd332366e0cd7e4e0f1fc0..54d866d40d4559ecd4c12a0c4f2610bfa6fd3ca0 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -15,6 +15,7 @@
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/browsing_data_helper.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/chrome_benchmarking_message_filter.h"
@@ -1511,7 +1512,8 @@ void ChromeContentBrowserClient::ClearCache(RenderViewHost* rvh) {
   BrowsingDataRemover* remover = new BrowsingDataRemover(profile,
       BrowsingDataRemover::EVERYTHING,
       base::Time());
-  remover->Remove(BrowsingDataRemover::REMOVE_CACHE);
+  remover->Remove(BrowsingDataRemover::REMOVE_CACHE,
+                  BrowsingDataHelper::UNPROTECTED_WEB);
   // BrowsingDataRemover takes care of deleting itself when done.
 }
 
@@ -1522,7 +1524,8 @@ void ChromeContentBrowserClient::ClearCookies(RenderViewHost* rvh) {
       BrowsingDataRemover::EVERYTHING,
       base::Time());
   int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
-  remover->Remove(remove_mask);
+  bool include_protected_origins = false;

[Bernhard Bauer, 2012/05/31 15:57:31]

Is this implicitly casted to an int? I hate C++.

[Mike West, 2012/06/01 13:35:17]

So ugly. Thanks for catching this.

+  remover->Remove(remove_mask, include_protected_origins);
   // BrowsingDataRemover takes care of deleting itself when done.
 }