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

chrome/browser/browsing_data_database_helper.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/browsing_data_database_helper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using WebKit::WebSecurityOrigin;
 
-BrowsingDataDatabaseHelper::DatabaseInfo::DatabaseInfo()
-    : size(0) {
-}
-
 BrowsingDataDatabaseHelper::DatabaseInfo::DatabaseInfo(
     const std::string& host,
     const std::string& database_name,
     const std::string& origin_identifier,
     const std::string& description,
     const std::string& origin,
     int64 size,
     base::Time last_modified)
     : host(host),
       database_name(database_name),
@@ skipping 89 matching lines @@
 void BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread(
     const std::string& origin,
     const std::string& name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!tracker_.get())
     return;
   tracker_->DeleteDatabase(UTF8ToUTF16(origin), UTF8ToUTF16(name),
                            net::CompletionCallback());
 }
 
-CannedBrowsingDataDatabaseHelper::PendingDatabaseInfo::PendingDatabaseInfo() {}
-
 CannedBrowsingDataDatabaseHelper::PendingDatabaseInfo::PendingDatabaseInfo(
     const GURL& origin,
     const std::string& name,
     const std::string& description)
     : origin(origin),
       name(name),
       description(description) {
 }
 
 CannedBrowsingDataDatabaseHelper::PendingDatabaseInfo::~PendingDatabaseInfo() {}
 
+bool CannedBrowsingDataDatabaseHelper::PendingDatabaseInfo::operator<(
+    const PendingDatabaseInfo& other) const {
+  if (origin == other.origin)
+    return name < other.name;
+  return origin < other.origin;
+}
+
 CannedBrowsingDataDatabaseHelper::CannedBrowsingDataDatabaseHelper(
     Profile* profile)
     : BrowsingDataDatabaseHelper(profile),
       profile_(profile) {
 }
 
 CannedBrowsingDataDatabaseHelper* CannedBrowsingDataDatabaseHelper::Clone() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CannedBrowsingDataDatabaseHelper* clone =
       new CannedBrowsingDataDatabaseHelper(profile_);
 
   base::AutoLock auto_lock(lock_);
   clone->pending_database_info_ = pending_database_info_;
   clone->database_info_ = database_info_;
   return clone;
 }
 
 void CannedBrowsingDataDatabaseHelper::AddDatabase(
     const GURL& origin,
     const std::string& name,
     const std::string& description) {
   base::AutoLock auto_lock(lock_);
   if (BrowsingDataHelper::HasValidScheme(origin)) {
-    pending_database_info_.push_back(PendingDatabaseInfo(
+    pending_database_info_.insert(PendingDatabaseInfo(
           origin, name, description));
   }
 }
 
 void CannedBrowsingDataDatabaseHelper::Reset() {
   base::AutoLock auto_lock(lock_);
   database_info_.clear();
   pending_database_info_.clear();
 }
 
 bool CannedBrowsingDataDatabaseHelper::empty() const {
   base::AutoLock auto_lock(lock_);
-  return database_info_.empty() && pending_database_info_.empty();
+  return pending_database_info_.empty();
 }
 
 size_t CannedBrowsingDataDatabaseHelper::GetDatabaseCount() const {
+  base::AutoLock auto_lock(lock_);
   return pending_database_info_.size();
 }
 
+const std::set<CannedBrowsingDataDatabaseHelper::PendingDatabaseInfo>&
+CannedBrowsingDataDatabaseHelper::GetPendingDatabaseInfo() {
+  return pending_database_info_;
+}
+
 void CannedBrowsingDataDatabaseHelper::StartFetching(
     const base::Callback<void(const std::list<DatabaseInfo>&)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!is_fetching_);
   DCHECK_EQ(false, callback.is_null());
 
   is_fetching_ = true;
   completion_callback_ = callback;
   BrowserThread::PostTask(
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
       base::Bind(&CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread,
                  this));
 }
 
 CannedBrowsingDataDatabaseHelper::~CannedBrowsingDataDatabaseHelper() {}
 
 void CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread() {
   base::AutoLock auto_lock(lock_);
-  for (std::list<PendingDatabaseInfo>::const_iterator
+  database_info_.clear();
+  for (std::set<PendingDatabaseInfo>::const_iterator
        info = pending_database_info_.begin();
        info != pending_database_info_.end(); ++info) {
     WebSecurityOrigin web_security_origin =
         WebSecurityOrigin::createFromString(
             UTF8ToUTF16(info->origin.spec()));
     std::string origin_identifier =
         web_security_origin.databaseIdentifier().utf8();
 
-    bool duplicate = false;
-    for (std::list<DatabaseInfo>::iterator database = database_info_.begin();
-         database != database_info_.end(); ++database) {
-      if (database->origin_identifier == origin_identifier &&
-          database->database_name == info->name) {
-        duplicate = true;
-        break;
-      }
-    }
-    if (duplicate)
-      continue;
-
     database_info_.push_back(DatabaseInfo(
         web_security_origin.host().utf8(),
         info->name,
         origin_identifier,
         info->description,
         web_security_origin.toString().utf8(),
         0,
         base::Time()));
   }
-  pending_database_info_.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CannedBrowsingDataDatabaseHelper::NotifyInUIThread, this));
 }