Refactor IndexedDBInfo out of browsingdata

chrome/browser/browsing_data/mock_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/mock_browsing_data_indexed_db_helper.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 
 MockBrowsingDataIndexedDBHelper::MockBrowsingDataIndexedDBHelper() {
 }
 
 MockBrowsingDataIndexedDBHelper::~MockBrowsingDataIndexedDBHelper() {
 }
 
 void MockBrowsingDataIndexedDBHelper::StartFetching(
-    const base::Callback<void(const std::list<IndexedDBInfo>&)>& callback) {
+    const base::Callback<void(const std::list<content::IndexedDBInfo>&)>&
+    callback) {
   callback_ = callback;
 }
 
 void MockBrowsingDataIndexedDBHelper::DeleteIndexedDB(
     const GURL& origin) {
   CHECK(origins_.find(origin) != origins_.end());
   origins_[origin] = false;
 }
 
 void MockBrowsingDataIndexedDBHelper::AddIndexedDBSamples() {
   const GURL kOrigin1("http://idbhost1:1/");
   const GURL kOrigin2("http://idbhost2:2/");
-  response_.push_back(
-      BrowsingDataIndexedDBHelper::IndexedDBInfo(
-          kOrigin1, 1, base::Time()));
+  content::IndexedDBInfo info1 = { kOrigin1, 1, base::Time() };

[michaeln, 2013/04/10 00:47:26]

<aside>
this looks fine, but i think is it generally more common for us to have ctors to
perform struct initialization than using c style syntax (not positive about
that, just an impression)? idk, if our style guide has any recommendation.
</aside>

[alecflett, 2013/04/10 17:17:17]

Yeah the style guide doesn't offer specific guidance here - part of the issue is
that these are structs used in an interface - in the spirit of keeping the
interface clean of implementations, I left out a constructor. I'll leave it in
but an alternative would have been a more wordy:

content::IndexedDBInfo info1;
info1.url = kOrigin1;
info1.size = 1;
info1.last_modified = base::Time();

which at least for the sake of the tests seemed like a step backwards.

+  response_.push_back(info1);
   origins_[kOrigin1] = true;
-  response_.push_back(
-      BrowsingDataIndexedDBHelper::IndexedDBInfo(
-          kOrigin2, 2, base::Time()));
+  content::IndexedDBInfo info2 = { kOrigin2, 2, base::Time() };
+  response_.push_back(info2);
   origins_[kOrigin2] = true;
 }
 
 void MockBrowsingDataIndexedDBHelper::Notify() {
   CHECK_EQ(false, callback_.is_null());
   callback_.Run(response_);
 }
 
 void MockBrowsingDataIndexedDBHelper::Reset() {
   for (std::map<GURL, bool>::iterator i = origins_.begin();
        i != origins_.end(); ++i)
     i->second = true;
 }
 
 bool MockBrowsingDataIndexedDBHelper::AllDeleted() {
   for (std::map<GURL, bool>::const_iterator i = origins_.begin();
        i != origins_.end(); ++i)
     if (i->second)
       return false;
   return true;
 }