Display third party cookies and site data counts in the WebsiteSettings UI.

chrome/browser/browsing_data_indexed_db_helper.cc

Index: chrome/browser/browsing_data_indexed_db_helper.cc
diff --git a/chrome/browser/browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data_indexed_db_helper.cc
index c12322542abb7d4a51b91c55ffdf9af59a6c1123..8869e68cfba62dd2e42c2d30a7b4dbeeb91745a5 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/browsing_data_indexed_db_helper.cc
@@ -151,10 +151,6 @@ BrowsingDataIndexedDBHelper* BrowsingDataIndexedDBHelper::Create(
 }
 
 CannedBrowsingDataIndexedDBHelper::
-PendingIndexedDBInfo::PendingIndexedDBInfo() {
-}
-
-CannedBrowsingDataIndexedDBHelper::
 PendingIndexedDBInfo::PendingIndexedDBInfo(const GURL& origin,
                                            const string16& description)
     : origin(origin),
@@ -165,10 +161,17 @@ CannedBrowsingDataIndexedDBHelper::
 PendingIndexedDBInfo::~PendingIndexedDBInfo() {
 }
 
+bool CannedBrowsingDataIndexedDBHelper::PendingIndexedDBInfo::operator<(
+    const PendingIndexedDBInfo& other) const {
+  return origin < other.origin;
+}
+
 CannedBrowsingDataIndexedDBHelper::CannedBrowsingDataIndexedDBHelper()
     : is_fetching_(false) {
 }
 
+CannedBrowsingDataIndexedDBHelper::~CannedBrowsingDataIndexedDBHelper() {}
+
 CannedBrowsingDataIndexedDBHelper* CannedBrowsingDataIndexedDBHelper::Clone() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CannedBrowsingDataIndexedDBHelper* clone =
@@ -186,7 +189,7 @@ void CannedBrowsingDataIndexedDBHelper::AddIndexedDB(
     return;  // Non-websafe state is not considered browsing data.
 
   base::AutoLock auto_lock(lock_);
-  pending_indexed_db_info_.push_back(PendingIndexedDBInfo(origin, description));
+  pending_indexed_db_info_.insert(PendingIndexedDBInfo(origin, description));
 }
 
 void CannedBrowsingDataIndexedDBHelper::Reset() {
@@ -201,9 +204,16 @@ bool CannedBrowsingDataIndexedDBHelper::empty() const {
 }
 
 size_t CannedBrowsingDataIndexedDBHelper::GetIndexedDBCount() const {
+  base::AutoLock auto_lock(lock_);
   return pending_indexed_db_info_.size();
 }
 
+const std::set<CannedBrowsingDataIndexedDBHelper::PendingIndexedDBInfo>&
+CannedBrowsingDataIndexedDBHelper::GetIndexedDBInfo() const  {
+  base::AutoLock auto_lock(lock_);
+  return pending_indexed_db_info_;
+}
+
 void CannedBrowsingDataIndexedDBHelper::StartFetching(
     const base::Callback<void(const std::list<IndexedDBInfo>&)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -219,11 +229,10 @@ void CannedBrowsingDataIndexedDBHelper::StartFetching(
           this));
 }
 
-CannedBrowsingDataIndexedDBHelper::~CannedBrowsingDataIndexedDBHelper() {}
-
 void CannedBrowsingDataIndexedDBHelper::ConvertPendingInfoInWebKitThread() {
   base::AutoLock auto_lock(lock_);
-  for (std::list<PendingIndexedDBInfo>::const_iterator
+  indexed_db_info_.clear();
+  for (std::set<PendingIndexedDBInfo>::const_iterator
        info = pending_indexed_db_info_.begin();
        info != pending_indexed_db_info_.end(); ++info) {
     bool duplicate = false;

[Bernhard Bauer, 2012/05/10 17:18:59]

I think you don't need this anymore if you have a set?

[markusheintz_, 2012/05/11 12:18:28]

Done.

@@ -243,11 +252,10 @@ void CannedBrowsingDataIndexedDBHelper::ConvertPendingInfoInWebKitThread() {
         0,
         base::Time()));
   }
-  pending_indexed_db_info_.clear();
 
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&CannedBrowsingDataIndexedDBHelper::NotifyInUIThread, this));
+ BrowserThread::PostTask(
+     BrowserThread::UI, FROM_HERE,
+     base::Bind(&CannedBrowsingDataIndexedDBHelper::NotifyInUIThread, this));
 }
 
 void CannedBrowsingDataIndexedDBHelper::NotifyInUIThread() {