Rename REMOVE_COOKIES to REMOVE_SITE_DATA

chrome/browser/extensions/extension_clear_api.cc

Index: chrome/browser/extensions/extension_clear_api.cc
diff --git a/chrome/browser/extensions/extension_clear_api.cc b/chrome/browser/extensions/extension_clear_api.cc
index 0ad4901e3cff811444ed7d3a812ccc5fa86e3544..f2fc800d1dc59a0f4f2eab229a73923e4fbc9a94 100644
--- a/chrome/browser/extensions/extension_clear_api.cc
+++ b/chrome/browser/extensions/extension_clear_api.cc
@@ -71,13 +71,9 @@ int ParseRemovalMask(base::DictionaryValue* value) {
     GetRemovalMask |= BrowsingDataRemover::REMOVE_PASSWORDS;
 
   // When we talk users about "cookies", we mean not just cookies, but pretty
-  // much everything associated with an origin. To that end, we explicitly
-  // include the REMOVE_LSO_DATA mask here, and BrowsingDataRemover interprets
-  // the REMOVE_COOKIES mask internally as "cookies and site data".
-  if (DataRemovalRequested(value, keys::kCookiesKey)) {
-    GetRemovalMask |= BrowsingDataRemover::REMOVE_COOKIES;
-    GetRemovalMask |= BrowsingDataRemover::REMOVE_LSO_DATA;
-  }
+  // much everything associated with an origin.
+  if (DataRemovalRequested(value, keys::kCookiesKey))
+    GetRemovalMask |= BrowsingDataRemover::REMOVE_SITE_DATA;
 
   return GetRemovalMask;
 }
@@ -133,8 +129,7 @@ int ClearCacheFunction::GetRemovalMask() const {
 }
 
 int ClearCookiesFunction::GetRemovalMask() const {
-  return BrowsingDataRemover::REMOVE_COOKIES |
-         BrowsingDataRemover::REMOVE_LSO_DATA;
+  return BrowsingDataRemover::REMOVE_SITE_DATA;
 }
 
 int ClearDownloadsFunction::GetRemovalMask() const {