summaryrefslogtreecommitdiffstats
path: root/content/browser/browsing_instance.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 12:01:15 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 12:01:15 +0000
commit3ce02419d4f7b3cd1fc062f87fb63a78072b5483 (patch)
tree6bdbb2cc363827fe8fb6186d5cbf5787f5aaf29d /content/browser/browsing_instance.cc
parentaf3f286560a8fadb4eb6cb51c7ba2cb0f8e17a66 (diff)
downloadchromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.zip
chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.tar.gz
chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.tar.bz2
Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder
BUG=73903 TEST=tests for proxy and webrequest API should still work Review URL: http://codereview.chromium.org/6598002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browsing_instance.cc')
-rw-r--r--content/browser/browsing_instance.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc
index e3efa82..1759fc0 100644
--- a/content/browser/browsing_instance.cc
+++ b/content/browser/browsing_instance.cc
@@ -57,7 +57,7 @@ BrowsingInstance::SiteInstanceMap* BrowsingInstance::GetSiteInstanceMap(
// Otherwise, process-per-site is in use, at least for this URL. Look up the
// global map for this profile, creating an entry if necessary.
ProfileId runtime_id = profile ? profile->GetRuntimeId()
- : Profile::InvalidProfileId;
+ : Profile::kInvalidProfileId;
return &profile_site_instance_map_[runtime_id];
}
@@ -124,7 +124,7 @@ void BrowsingInstance::UnregisterSiteInstance(SiteInstance* site_instance) {
if (!RemoveSiteInstanceFromMap(&site_instance_map_, site, site_instance)) {
// Wasn't in our local map, so look in the static per-profile map.
ProfileId runtime_id = profile_ ? profile_->GetRuntimeId()
- : Profile::InvalidProfileId;
+ : Profile::kInvalidProfileId;
RemoveSiteInstanceFromMap(
&profile_site_instance_map_[runtime_id], site, site_instance);
}