Rename REMOVE_COOKIES to REMOVE_SITE_DATA

chrome/browser/extensions/extension_clear_api.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Defines the Chrome Extensions Clear API functions, which entail
 // clearing browsing data, and clearing the browser's cache (which, let's be
 // honest, are the same thing), as specified in
 // chrome/common/extensions/api/extension_api.json.
 
 #include "chrome/browser/extensions/extension_clear_api.h"
@@ skipping 53 matching lines @@
   if (DataRemovalRequested(value, keys::kDownloadsKey))
     GetRemovalMask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   if (DataRemovalRequested(value, keys::kFormDataKey))
     GetRemovalMask |= BrowsingDataRemover::REMOVE_FORM_DATA;
   if (DataRemovalRequested(value, keys::kHistoryKey))
     GetRemovalMask |= BrowsingDataRemover::REMOVE_HISTORY;
   if (DataRemovalRequested(value, keys::kPasswordsKey))
     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;
 }
 
 }  // Namespace.
 
 void BrowsingDataExtensionFunction::OnBrowsingDataRemoverDone() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   this->SendResponse(true);
 
@@ skipping 35 matching lines @@
     return ParseRemovalMask(data_to_remove);
   else
     return 0;
 }
 
 int ClearCacheFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_CACHE;
 }
 
 int ClearCookiesFunction::GetRemovalMask() const {
-  return BrowsingDataRemover::REMOVE_COOKIES |
-         BrowsingDataRemover::REMOVE_LSO_DATA;
+  return BrowsingDataRemover::REMOVE_SITE_DATA;
 }
 
 int ClearDownloadsFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_DOWNLOADS;
 }
 
 int ClearFormDataFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_FORM_DATA;
 }
 
 int ClearHistoryFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_HISTORY;
 }
 
 int ClearPasswordsFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_CACHE;
 }