diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-21 08:45:25 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-21 08:45:25 +0000 |
commit | aa96d3a64972cdfe24bd6e9e4db64831ea131555 (patch) | |
tree | 68be9eda1ac813ba7c3612e5825658176d11e055 /chrome/browser/profile_impl.cc | |
parent | 8f43c4fce97304480f86f23df7326e51a65f80d8 (diff) | |
download | chromium_src-aa96d3a64972cdfe24bd6e9e4db64831ea131555.zip chromium_src-aa96d3a64972cdfe24bd6e9e4db64831ea131555.tar.gz chromium_src-aa96d3a64972cdfe24bd6e9e4db64831ea131555.tar.bz2 |
When extension is blacklisted by admin policy, it should be removed if already running.
(Attempt 2 at landing this, this time with changes to fix Enabledness unit test)
BUG=51689
TEST=ExtensionsServiceTest.BlacklistedByPolicyRemovedIfRunning
Review URL: http://codereview.chromium.org/3166023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile_impl.cc')
-rw-r--r-- | chrome/browser/profile_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc index 84a2b17..5680658 100644 --- a/chrome/browser/profile_impl.cc +++ b/chrome/browser/profile_impl.cc @@ -509,10 +509,10 @@ ProfileImpl::~ProfileImpl() { favicon_service_ = NULL; if (extension_message_service_) - extension_message_service_->ProfileDestroyed(); + extension_message_service_->DestroyingProfile(); if (extensions_service_) - extensions_service_->ProfileDestroyed(); + extensions_service_->DestroyingProfile(); // This causes the Preferences file to be written to disk. MarkAsCleanShutdown(); |