Add SiteInstance parameters to IndexedDBContext calls

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 "chrome/browser/profiles/profile.h"
+#include "content/public/browser/browser_context.h"

[awong, 2012/09/10 21:55:21]

Why do you need browser_context.h?

[alecflett, 2012/09/10 23:14:55]

oops, don't now.

 #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::BrowserContext;
 using content::BrowserThread;
 using content::IndexedDBContext;
 using webkit_database::DatabaseUtil;
 
 namespace {
 
 class BrowsingDataIndexedDBHelperImpl : public BrowsingDataIndexedDBHelper {
  public:
-  explicit BrowsingDataIndexedDBHelperImpl(Profile* profile);
+  explicit BrowsingDataIndexedDBHelperImpl(IndexedDBContext* context);

[awong, 2012/09/10 21:55:21]

Call this indexed_db_context.   Yeah it's long. :(

[alecflett, 2012/09/10 23:14:55]

Done.

 
   virtual void StartFetching(
       const base::Callback<void(const std::list<IndexedDBInfo>&)>&
           callback) OVERRIDE;
   virtual void DeleteIndexedDB(const GURL& origin) OVERRIDE;
 
  private:
   virtual ~BrowsingDataIndexedDBHelperImpl();
 
   // Enumerates all indexed database files in the WEBKIT thread.
@@ skipping 19 matching lines @@
   // Indicates whether or not we're currently fetching information:
   // it's true when StartFetching() is called in the UI thread, and it's reset
   // after we notified the callback in the UI thread.
   // This only mutates on the UI thread.
   bool is_fetching_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataIndexedDBHelperImpl);
 };
 
 BrowsingDataIndexedDBHelperImpl::BrowsingDataIndexedDBHelperImpl(
-    Profile* profile)
-    : indexed_db_context_(BrowserContext::GetIndexedDBContext(profile)),
+    IndexedDBContext* context)
+    : indexed_db_context_(context),
       is_fetching_(false) {
   DCHECK(indexed_db_context_.get());
 }
 
 BrowsingDataIndexedDBHelperImpl::~BrowsingDataIndexedDBHelperImpl() {
 }
 
 void BrowsingDataIndexedDBHelperImpl::StartFetching(
     const base::Callback<void(const std::list<IndexedDBInfo>&)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 61 matching lines @@
     base::Time last_modified)
     : origin(origin),
       size(size),
       last_modified(last_modified) {
 }
 
 BrowsingDataIndexedDBHelper::IndexedDBInfo::~IndexedDBInfo() {}
 
 // static
 BrowsingDataIndexedDBHelper* BrowsingDataIndexedDBHelper::Create(
-    Profile* profile) {
-  return new BrowsingDataIndexedDBHelperImpl(profile);
+    IndexedDBContext* context) {
+  return new BrowsingDataIndexedDBHelperImpl(context);
 }
 
 CannedBrowsingDataIndexedDBHelper::
 PendingIndexedDBInfo::PendingIndexedDBInfo(const GURL& origin,
                                            const string16& name)
     : origin(origin),
       name(name) {
 }
 
 CannedBrowsingDataIndexedDBHelper::
@@ skipping 88 matching lines @@
 }
 
 void CannedBrowsingDataIndexedDBHelper::NotifyInUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(is_fetching_);
 
   completion_callback_.Run(indexed_db_info_);
   completion_callback_.Reset();
   is_fetching_ = false;
 }