Rename REMOVE_COOKIES to REMOVE_SITE_DATA

Rename REMOVE_COOKIES to REMOVE_SITE_DATA (which will explicitly include REMOVE_LSO_DATA).

There's no case in the current codebase when we want to remove _only_ LSO data, and no case where we want to remove cookies, but _not_ LSO data. There are many instances of building removal masks that binary-OR REMOVE_LSO_DATA and REMOVE_COOKIES together; this CL formalizes that by dropping the extra enum value.

Moreover, we talk about "cookies" differently when targeting users on the one hand, and developers on the other. REMOVE_COOKIES is a developer-facing name with a user-facing value, which is confusing. Renaming the current functionality to REMOVE_SITE_DATA is much more explicit, and will enable us to _just_ remove cookies at some point in the future via a REMOVE_COOKIES that actually means cookies.

REMOVE_SITE_DATA has exactly the same semantics that REMOVE_COOKIES used to, with one exception: REMOVE_COOKIES included deleting cached strict transport security values. This functionality has been moved to REMOVE_CACHE.

As a drive-by, this CL also moves a check against the kClearPluginLSODataEnabled pref out of webui (ClearBrowsingDataHandler) and into the BrowsingDataRemover itself, where it seems more likely to be effective.

BUG=92628, 94334
TEST=Nothing but removal cached transport-security values should change.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=99753

[Mike West, 2011-08-24 10:18:51]

Hey Bernhard!  When you get back from vacation, can you look at this CL?

CCing Jochen, though he's not going to be back for a loooong while. :)

[Mike West, 2011-09-05 11:42:06]

Let's start this again with the behavior we talked about today, Bernhard.

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

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
File chrome/browser/browsing_data_remover.cc (right):

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
chrome/browser/browsing_data_remover.cc:293: // Also delete cached
TransportSecurityState data.
Can you add that to the CL description?

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
File chrome/browser/browsing_data_remover.h (right):

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
chrome/browser/browsing_data_remover.h:60: REMOVE_CACHE = 1 << 1,
Is there a reason you're starting with 1 << 1 now?

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
chrome/browser/browsing_data_remover.h:76: REMOVE_SITE_DATA = (1 << 2) | (1 <<
3) | (1 << 5) | (1 << 8) | (1 << 9) |
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]

Can you take another look at the commit message, plus the fixes below?

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
File chrome/browser/browsing_data_remover.cc (right):

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
chrome/browser/browsing_data_remover.cc:293: // Also delete cached
TransportSecurityState data.
On 2011/09/05 11:53:01, Bernhard Bauer wrote:
> Can you add that to the CL description?

Done.

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
File chrome/browser/browsing_data_remover.h (right):

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
chrome/browser/browsing_data_remover.h:60: REMOVE_CACHE = 1 << 1,
On 2011/09/05 11:53:01, Bernhard Bauer wrote:
> Is there a reason you're starting with 1 << 1 now?

Because I'm stupid. :) Fixing.

http://codereview.chromium.org/7717023/diff/3001/chrome/browser/browsing_data...
chrome/browser/browsing_data_remover.h:76: REMOVE_SITE_DATA = (1 << 2) | (1 <<
3) | (1 << 5) | (1 << 8) | (1 << 9) |
On 2011/09/05 11:53:01, Bernhard Bauer wrote:
> Can you describe this as an OR'ing of the previous values? Or does the compile
> not like it?

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

[Bernhard Bauer, 2011-09-06 15:34:00]

LGTM.

[commit-bot: I haz the power, 2011-09-06 17:17:28]

Change committed as 99753