summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-26 00:07:40 +0000
committerwtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-26 00:07:40 +0000
commit4ec7ed7a1cbd5c589ac4f3761ac9010b1bc83176 (patch)
treed36b8cd8b61ee88a9d8303554d9923bb0f6fcb3f /net
parent47c10ee88d695ac7becebf06677634fd67f26796 (diff)
downloadchromium_src-4ec7ed7a1cbd5c589ac4f3761ac9010b1bc83176.zip
chromium_src-4ec7ed7a1cbd5c589ac4f3761ac9010b1bc83176.tar.gz
chromium_src-4ec7ed7a1cbd5c589ac4f3761ac9010b1bc83176.tar.bz2
Assert that the lifetimes of multiple ScopedHostMapper
instances are properly nested. R=darin BUG=2635 Review URL: http://codereview.chromium.org/4293 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/scoped_host_mapper.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/base/scoped_host_mapper.h b/net/base/scoped_host_mapper.h
index 82b6c4e..836cb34 100644
--- a/net/base/scoped_host_mapper.h
+++ b/net/base/scoped_host_mapper.h
@@ -52,7 +52,9 @@ class ScopedHostMapper : public HostMapper {
}
~ScopedHostMapper() {
- SetHostMapper(previous_host_mapper_);
+ HostMapper* old_mapper = SetHostMapper(previous_host_mapper_);
+ // The lifetimes of multiple instances must be nested.
+ CHECK(old_mapper == this);
}
// Any hostname matching the given pattern will be replaced with the given