diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 12:27:37 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 12:27:37 +0000 |
| commit | 712a9a05370715409d44e66479e863af5f3568e1 (patch) | |
| tree | 853c9f52328b63b4b12c861ea2ef7129747d8dba /chrome/browser/browsing_data_appcache_helper.cc | |
| parent | 3e3342690f7c69fa6e5802782c33a12eec000129 (diff) | |
| download | chromium_src-712a9a05370715409d44e66479e863af5f3568e1.zip chromium_src-712a9a05370715409d44e66479e863af5f3568e1.tar.gz chromium_src-712a9a05370715409d44e66479e863af5f3568e1.tar.bz2 | |
Use copies of canned browsing data helpers to populate the cookies tree model.
If the fetching of data is cancelled, the helpers might not be ready yet to be reused, triggering an assertion.
BUG=62311
TEST=interactive ui tests:CollectedCookies.*
Review URL: http://codereview.chromium.org/6670033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_appcache_helper.cc')
| -rw-r--r-- | chrome/browser/browsing_data_appcache_helper.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc index 7cd83c9..6a7e8ee 100644 --- a/chrome/browser/browsing_data_appcache_helper.cc +++ b/chrome/browser/browsing_data_appcache_helper.cc @@ -103,10 +103,20 @@ ChromeAppCacheService* BrowsingDataAppCacheHelper::GetAppCacheService() { CannedBrowsingDataAppCacheHelper::CannedBrowsingDataAppCacheHelper( Profile* profile) - : BrowsingDataAppCacheHelper(profile) { + : BrowsingDataAppCacheHelper(profile), + profile_(profile) { info_collection_ = new appcache::AppCacheInfoCollection; } +CannedBrowsingDataAppCacheHelper* CannedBrowsingDataAppCacheHelper::Clone() { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + CannedBrowsingDataAppCacheHelper* clone = + new CannedBrowsingDataAppCacheHelper(profile_); + + clone->info_collection_->infos_by_origin = info_collection_->infos_by_origin; + return clone; +} + void CannedBrowsingDataAppCacheHelper::AddAppCache(const GURL& manifest_url) { typedef std::map<GURL, appcache::AppCacheInfoVector> InfoByOrigin; InfoByOrigin& origin_map = info_collection_->infos_by_origin; |