Refactor IndexedDBInfo out of browsingdata

chrome/browser/browsing_data/browsing_data_indexed_db_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/browsing_data_indexed_db_helper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/indexed_db_context.h"
 #include "webkit/database/database_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::BrowserThread;
 using content::IndexedDBContext;
+using content::IndexedDBInfo;
 using webkit_database::DatabaseUtil;
 
 namespace {
 
 class BrowsingDataIndexedDBHelperImpl : public BrowsingDataIndexedDBHelper {
  public:
   explicit BrowsingDataIndexedDBHelperImpl(
       IndexedDBContext* indexed_db_context);
 
   virtual void StartFetching(
@@ skipping 63 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
       base::Bind(
           &BrowsingDataIndexedDBHelperImpl::DeleteIndexedDBInWebKitThread, this,
           origin));
 }
 
 void BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
-  std::vector<GURL> origins = indexed_db_context_->GetAllOrigins();
-  for (std::vector<GURL>::const_iterator iter = origins.begin();
+  std::vector<IndexedDBInfo> origins = indexed_db_context_->GetAllOriginsInfo();
+  for (std::vector<IndexedDBInfo>::const_iterator iter = origins.begin();
        iter != origins.end(); ++iter) {
-    const GURL& origin = *iter;
-    if (!BrowsingDataHelper::HasWebScheme(origin))
+    const IndexedDBInfo& origin = *iter;

[michaeln, 2013/04/10 00:51:17]

nit: maybe change this variable's name to 'info' for clarity

+    if (!BrowsingDataHelper::HasWebScheme(origin.origin))
       continue;  // Non-websafe state is not considered browsing data.
 
-    indexed_db_info_.push_back(IndexedDBInfo(
-        origin,
-        indexed_db_context_->GetOriginDiskUsage(origin),
-        indexed_db_context_->GetOriginLastModified(origin)));
+    indexed_db_info_.push_back(origin);
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataIndexedDBHelperImpl::NotifyInUIThread, this));
 }
 
 void BrowsingDataIndexedDBHelperImpl::NotifyInUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(is_fetching_);
   completion_callback_.Run(indexed_db_info_);
   completion_callback_.Reset();
   is_fetching_ = false;
 }
 
 void BrowsingDataIndexedDBHelperImpl::DeleteIndexedDBInWebKitThread(
     const GURL& origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   indexed_db_context_->DeleteForOrigin(origin);
 }
 
 }  // namespace
 
-BrowsingDataIndexedDBHelper::IndexedDBInfo::IndexedDBInfo(
-    const GURL& origin,
-    int64 size,
-    base::Time last_modified)
-    : origin(origin),
-      size(size),
-      last_modified(last_modified) {
-}
-
-BrowsingDataIndexedDBHelper::IndexedDBInfo::~IndexedDBInfo() {}
 
 // static
 BrowsingDataIndexedDBHelper* BrowsingDataIndexedDBHelper::Create(
     IndexedDBContext* indexed_db_context) {
   return new BrowsingDataIndexedDBHelperImpl(indexed_db_context);
 }
 
 CannedBrowsingDataIndexedDBHelper::
 PendingIndexedDBInfo::PendingIndexedDBInfo(const GURL& origin,
                                            const string16& name)
@@ skipping 72 matching lines @@
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
       base::Bind(
           &CannedBrowsingDataIndexedDBHelper::ConvertPendingInfoInWebKitThread,
           this));
 }
 
 void CannedBrowsingDataIndexedDBHelper::ConvertPendingInfoInWebKitThread() {
   base::AutoLock auto_lock(lock_);
   indexed_db_info_.clear();
   for (std::set<PendingIndexedDBInfo>::const_iterator
-       info = pending_indexed_db_info_.begin();
-       info != pending_indexed_db_info_.end(); ++info) {
-    indexed_db_info_.push_back(IndexedDBInfo(
-        info->origin,
-        0,
-        base::Time()));
+       pending_info = pending_indexed_db_info_.begin();
+       pending_info != pending_indexed_db_info_.end(); ++pending_info) {
+    IndexedDBInfo info = { pending_info->origin, 0, base::Time() };
+    indexed_db_info_.push_back(info);
   }
 
  BrowserThread::PostTask(
      BrowserThread::UI, FROM_HERE,
      base::Bind(&CannedBrowsingDataIndexedDBHelper::NotifyInUIThread, this));
 }
 
 void CannedBrowsingDataIndexedDBHelper::NotifyInUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(is_fetching_);
 
   completion_callback_.Run(indexed_db_info_);
   completion_callback_.Reset();
   is_fetching_ = false;
 }