summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 16:19:38 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 16:19:38 +0000
commitefa5521a57c9765bc968d42ce22bb449ae40f3b3 (patch)
tree840dec6cea752cdf16270706f191f34798995f0b /content/browser
parentb7f9d3187e8a7af317058a1c0194a8af47818e86 (diff)
downloadchromium_src-efa5521a57c9765bc968d42ce22bb449ae40f3b3.zip
chromium_src-efa5521a57c9765bc968d42ce22bb449ae40f3b3.tar.gz
chromium_src-efa5521a57c9765bc968d42ce22bb449ae40f3b3.tar.bz2
Followup to r85247 to address review comments about adding a way to get to ProfileIOData from content::ResourceClient.
Review URL: http://codereview.chromium.org/6973054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/resource_context.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/resource_context.cc b/content/browser/resource_context.cc
index 6af4651..e918585 100644
--- a/content/browser/resource_context.cc
+++ b/content/browser/resource_context.cc
@@ -23,6 +23,8 @@ ResourceContext::ResourceContext()
ResourceContext::~ResourceContext() {}
void* ResourceContext::GetUserData(const void* key) const {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ EnsureInitialized();
UserDataMap::const_iterator found = user_data_.find(key);
if (found != user_data_.end())
return found->second;
@@ -30,6 +32,7 @@ void* ResourceContext::GetUserData(const void* key) const {
}
void ResourceContext::SetUserData(const void* key, void* data) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
user_data_[key] = data;
}