summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extensions_service_unittest.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 03:10:34 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 03:10:34 +0000
commit7387509129d02968481c9cd912ab60c79bd6deea (patch)
tree1cb2e357aea3217dc79f83d98528b65280d2bf21 /chrome/browser/extensions/extensions_service_unittest.cc
parent653a73f611d9c3c69be17fdafcce6e41328df18a (diff)
downloadchromium_src-7387509129d02968481c9cd912ab60c79bd6deea.zip
chromium_src-7387509129d02968481c9cd912ab60c79bd6deea.tar.gz
chromium_src-7387509129d02968481c9cd912ab60c79bd6deea.tar.bz2
Revert r18661.
Broke purify and mac valgrind. "Pull Extension-related prefs into its own class. Also add a notification for when the extensions service has finished its initial load of extensions, separate from EXTENSIONS_LOADED.TEST=noneBUG=none" Review URL: http://codereview.chromium.org/132008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extensions_service_unittest.cc')
-rw-r--r--chrome/browser/extensions/extensions_service_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 2a4c104..b3dfe7e 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -999,9 +999,9 @@ TEST_F(ExtensionsServiceTest, ExternalInstallPref) {
ValidatePref(good_crx, L"state", Extension::ENABLED);
ValidatePref(good_crx, L"location", Extension::EXTERNAL_PREF);
- // Now uninstall the extension and verify that it doesn't get reinstalled.
- service_->UninstallExtension(id);
- loop_.RunAllPending();
+ // Now set the kill bit and watch the extension go away.
+ SetPref(good_crx, L"state", Extension::KILLBIT);
+ profile_->GetPrefs()->ScheduleSavePersistentPrefs();
loaded_.clear();
service_->ReloadExtensions();