Refactor IndexedDBInfo out of browsingdata

chrome/browser/browsing_data/browsing_data_indexed_db_helper.h

Index: chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
index 967c320c79356420d0e9d9168ca10e681076b8ea..ee4e76f4ef971577e27c326f5d4f92275e53ffdc 100644
--- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
@@ -15,14 +15,11 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
+#include "content/public/browser/indexed_db_context.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
 
-namespace content {
-class IndexedDBContext;
-}
-
 // BrowsingDataIndexedDBHelper is an interface for classes dealing with
 // aggregating and deleting browsing data stored in indexed databases.  A
 // client of this class need to call StartFetching from the UI thread to
@@ -31,19 +28,6 @@ class IndexedDBContext;
 class BrowsingDataIndexedDBHelper
     : public base::RefCountedThreadSafe<BrowsingDataIndexedDBHelper> {
  public:
-  // Contains detailed information about an indexed database.
-  struct IndexedDBInfo {
-    IndexedDBInfo(
-        const GURL& origin,
-        int64 size,
-        base::Time last_modified);
-    ~IndexedDBInfo();
-
-    GURL origin;
-    int64 size;
-    base::Time last_modified;
-  };
-
   // Create a BrowsingDataIndexedDBHelper instance for the indexed databases
   // stored in |profile|'s user data directory.
   static BrowsingDataIndexedDBHelper* Create(
@@ -53,7 +37,7 @@ class BrowsingDataIndexedDBHelper
   // callback.
   // This must be called only in the UI thread.
   virtual void StartFetching(
-      const base::Callback<void(const std::list<IndexedDBInfo>&)>&
+      const base::Callback<void(const std::list<content::IndexedDBInfo>&)>&
           callback) = 0;
   // Requests a single indexed database to be deleted in the WEBKIT thread.
   virtual void DeleteIndexedDB(const GURL& origin) = 0;
@@ -107,7 +91,7 @@ class CannedBrowsingDataIndexedDBHelper
 
   // BrowsingDataIndexedDBHelper methods.
   virtual void StartFetching(
-      const base::Callback<void(const std::list<IndexedDBInfo>&)>&
+      const base::Callback<void(const std::list<content::IndexedDBInfo>&)>&
           callback) OVERRIDE;
 
   virtual void DeleteIndexedDB(const GURL& origin) OVERRIDE {}
@@ -133,10 +117,11 @@ class CannedBrowsingDataIndexedDBHelper
   // the UI thread.
   // In the context of this class |indexed_db_info_| is only accessed on the UI
   // thread.
-  std::list<IndexedDBInfo> indexed_db_info_;
+  std::list<content::IndexedDBInfo> indexed_db_info_;
 
   // This only mutates on the UI thread.
-  base::Callback<void(const std::list<IndexedDBInfo>&)> completion_callback_;
+  base::Callback<void(const std::list<content::IndexedDBInfo>&)>
+      completion_callback_;
 
   // Indicates whether or not we're currently fetching information:
   // it's true when StartFetching() is called in the UI thread, and it's reset