diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-19 00:08:28 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-19 00:08:28 +0000 |
commit | c0e55036275c4b8bffb82439bd19a8562c870251 (patch) | |
tree | 1bda34b24bffd68db940f27146476671480b5fe6 /chrome/browser/extensions/extension_service.cc | |
parent | e2ccb522ea5a3971629af09dc5b0b24bbc35fbf6 (diff) | |
download | chromium_src-c0e55036275c4b8bffb82439bd19a8562c870251.zip chromium_src-c0e55036275c4b8bffb82439bd19a8562c870251.tar.gz chromium_src-c0e55036275c4b8bffb82439bd19a8562c870251.tar.bz2 |
Reverting to green up the memory waterfall.
BUG=114787
Revert 122521 - Move creation of BrowserContext objects that live in content to content, instead of depending on the embedder. Apart from allowing us to hide more of content from embedders, it simplifies the work that every embedder has to do (see the change the shell_browser_context.cc as an example).
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9419033
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9421023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.cc')
-rw-r--r-- | chrome/browser/extensions/extension_service.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 3b0902c..81a6a2f3 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -120,7 +120,6 @@ #endif using base::Time; -using content::BrowserContext; using content::BrowserThread; using content::DevToolsAgentHost; using content::DevToolsAgentHostRegistry; @@ -1137,9 +1136,9 @@ void ExtensionService::NotifyExtensionUnloaded( #if defined(OS_CHROMEOS) // Revoke external file access to - if (BrowserContext::GetFileSystemContext(profile_) && - BrowserContext::GetFileSystemContext(profile_)->external_provider()) { - BrowserContext::GetFileSystemContext(profile_)->external_provider()-> + if (profile_->GetFileSystemContext() && + profile_->GetFileSystemContext()->external_provider()) { + profile_->GetFileSystemContext()->external_provider()-> RevokeAccessForExtension(extension->id()); } |