summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/browsing_data_remover.cc10
-rw-r--r--chrome/browser/browsing_data_remover.h10
-rw-r--r--chrome/browser/browsing_data_remover_unittest.cc28
-rw-r--r--chrome/browser/extensions/extension_clear_api.cc10
-rw-r--r--chrome/browser/extensions/extension_clear_api.h5
-rw-r--r--chrome/browser/ui/webui/options/clear_browser_data_handler.cc2
6 files changed, 33 insertions, 32 deletions
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 84c7c04..ebfe318 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -104,7 +104,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
waiting_for_clear_networking_history_(false),
waiting_for_clear_cookies_(false),
waiting_for_clear_cache_(false),
- waiting_for_clear_lso_data_(false),
+ waiting_for_clear_plugin_data_(false),
remove_mask_(0) {
DCHECK(profile);
}
@@ -128,7 +128,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
waiting_for_clear_networking_history_(false),
waiting_for_clear_cookies_(false),
waiting_for_clear_cache_(false),
- waiting_for_clear_lso_data_(false),
+ waiting_for_clear_plugin_data_(false),
remove_mask_(0) {
DCHECK(profile);
}
@@ -255,10 +255,10 @@ void BrowsingDataRemover::Remove(int remove_mask) {
}
}
- if (remove_mask & REMOVE_LSO_DATA) {
+ if (remove_mask & REMOVE_PLUGIN_DATA) {
UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData"));
- waiting_for_clear_lso_data_ = true;
+ waiting_for_clear_plugin_data_ = true;
if (!plugin_data_remover_.get()) {
plugin_data_remover_.reset(
content::PluginDataRemover::Create(profile_->GetResourceContext()));
@@ -593,7 +593,7 @@ void BrowsingDataRemover::OnQuotaManagedDataDeleted() {
void BrowsingDataRemover::OnWaitableEventSignaled(
base::WaitableEvent* waitable_event) {
- waiting_for_clear_lso_data_ = false;
+ waiting_for_clear_plugin_data_ = false;
NotifyAndDeleteIfDone();
}
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
index adb9b38..0257815 100644
--- a/chrome/browser/browsing_data_remover.h
+++ b/chrome/browser/browsing_data_remover.h
@@ -66,15 +66,15 @@ class BrowsingDataRemover : public content::NotificationObserver,
REMOVE_HISTORY = 1 << 6,
REMOVE_INDEXEDDB = 1 << 7,
REMOVE_LOCAL_STORAGE = 1 << 8,
- REMOVE_LSO_DATA = 1 << 9,
+ REMOVE_PLUGIN_DATA = 1 << 9,
REMOVE_PASSWORDS = 1 << 10,
REMOVE_WEBSQL = 1 << 11,
// "Site data" includes cookies, appcache, file systems, indexedDBs, local
- // storage, webSQL, and LSO data.
+ // storage, webSQL, and plugin data.
REMOVE_SITE_DATA = REMOVE_APPCACHE | REMOVE_COOKIES | REMOVE_FILE_SYSTEMS |
REMOVE_INDEXEDDB | REMOVE_LOCAL_STORAGE |
- REMOVE_LSO_DATA | REMOVE_WEBSQL
+ REMOVE_PLUGIN_DATA | REMOVE_WEBSQL
};
// When BrowsingDataRemover successfully removes data, a notification of type
@@ -217,7 +217,7 @@ class BrowsingDataRemover : public content::NotificationObserver,
!waiting_for_clear_history_ &&
!waiting_for_clear_quota_managed_data_ &&
!waiting_for_clear_networking_history_ &&
- !waiting_for_clear_lso_data_;
+ !waiting_for_clear_plugin_data_;
}
// Setter for removing_; DCHECKs that we can only start removing if we're not
@@ -265,7 +265,7 @@ class BrowsingDataRemover : public content::NotificationObserver,
bool waiting_for_clear_networking_history_;
bool waiting_for_clear_cookies_;
bool waiting_for_clear_cache_;
- bool waiting_for_clear_lso_data_;
+ bool waiting_for_clear_plugin_data_;
// Tracking how many origins need to be deleted, and whether we're finished
// gathering origins.
diff --git a/chrome/browser/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data_remover_unittest.cc
index b2365be..f074dc4 100644
--- a/chrome/browser/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data_remover_unittest.cc
@@ -390,10 +390,10 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverBoth) {
tester->PopulateTestQuotaManagedData(GetMockManager());
BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, tester.get());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, GetRemovalMask());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
quota::kStorageTypeTemporary));
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
@@ -415,10 +415,10 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyTemporary) {
tester->PopulateTestQuotaManagedTemporaryData(GetMockManager());
BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, tester.get());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, GetRemovalMask());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
quota::kStorageTypeTemporary));
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
@@ -440,10 +440,10 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyPersistent) {
tester->PopulateTestQuotaManagedPersistentData(GetMockManager());
BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, tester.get());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, GetRemovalMask());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
quota::kStorageTypeTemporary));
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
@@ -465,10 +465,10 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverNeither) {
GetMockManager(); // Creates the QuotaManager instance.
BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, tester.get());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, GetRemovalMask());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
quota::kStorageTypeTemporary));
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
@@ -490,10 +490,10 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, tester.get());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, GetRemovalMask());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
quota::kStorageTypeTemporary));
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
@@ -515,10 +515,10 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastWeek) {
BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_WEEK,
BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, tester.get());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, GetRemovalMask());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
quota::kStorageTypeTemporary));
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
@@ -546,10 +546,10 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedUnprotectedOrigins) {
BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, tester.get());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
- ~BrowsingDataRemover::REMOVE_LSO_DATA, GetRemovalMask());
+ ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin1,
quota::kStorageTypeTemporary));
EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
diff --git a/chrome/browser/extensions/extension_clear_api.cc b/chrome/browser/extensions/extension_clear_api.cc
index 80b69ad..71a6bb1 100644
--- a/chrome/browser/extensions/extension_clear_api.cc
+++ b/chrome/browser/extensions/extension_clear_api.cc
@@ -103,14 +103,14 @@ bool BrowsingDataExtensionFunction::RunImpl() {
removal_mask_ = GetRemovalMask();
- if (removal_mask_ & BrowsingDataRemover::REMOVE_LSO_DATA) {
- // If we're being asked to remove LSO data, check whether it's actually
+ if (removal_mask_ & BrowsingDataRemover::REMOVE_PLUGIN_DATA) {
+ // If we're being asked to remove plugin data, check whether it's actually
// supported.
Profile* profile = GetCurrentBrowser()->profile();
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(
- &BrowsingDataExtensionFunction::CheckRemovingLSODataSupported,
+ &BrowsingDataExtensionFunction::CheckRemovingPluginDataSupported,
this,
make_scoped_refptr(PluginPrefs::GetForProfile(profile))));
} else {
@@ -121,10 +121,10 @@ bool BrowsingDataExtensionFunction::RunImpl() {
return true;
}
-void BrowsingDataExtensionFunction::CheckRemovingLSODataSupported(
+void BrowsingDataExtensionFunction::CheckRemovingPluginDataSupported(
scoped_refptr<PluginPrefs> plugin_prefs) {
if (!PluginDataRemoverHelper::IsSupported(plugin_prefs))
- removal_mask_ &= ~BrowsingDataRemover::REMOVE_LSO_DATA;
+ removal_mask_ &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
diff --git a/chrome/browser/extensions/extension_clear_api.h b/chrome/browser/extensions/extension_clear_api.h
index af193d7..69a4a52 100644
--- a/chrome/browser/extensions/extension_clear_api.h
+++ b/chrome/browser/extensions/extension_clear_api.h
@@ -39,9 +39,10 @@ class BrowsingDataExtensionFunction : public AsyncExtensionFunction,
virtual int GetRemovalMask() const = 0;
private:
- // Updates the removal bitmask according to whether removing LSO data is
+ // Updates the removal bitmask according to whether removing plugin data is
// supported or not.
- void CheckRemovingLSODataSupported(scoped_refptr<PluginPrefs> plugin_prefs);
+ void CheckRemovingPluginDataSupported(
+ scoped_refptr<PluginPrefs> plugin_prefs);
// Called when we're ready to start removing data.
void StartRemoving();
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 677d07a..c1af0f5 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -107,7 +107,7 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
// Don't try to clear LSO data if it's not supported.
if (!*clear_plugin_lso_data_enabled_)
- site_data_mask &= ~BrowsingDataRemover::REMOVE_LSO_DATA;
+ site_data_mask &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
remove_mask |= site_data_mask;
}
if (prefs->GetBoolean(prefs::kDeletePasswords))
generated by cgit v1.1 at 2025-05-19 15:07:50 +0000