summaryrefslogtreecommitdiffstats
path: root/chrome/browser/protector/protected_prefs_watcher_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 23:55:28 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 23:55:28 +0000
commit695b5719c9e9c2e98f0b26c0776974d372ab594e (patch)
tree50cc7071a6ff7f6bd155ac734eded9db118e2e0c /chrome/browser/protector/protected_prefs_watcher_unittest.cc
parentfe2c5f5de80f2c33cb3e2c6cfda754f7aba733b9 (diff)
downloadchromium_src-695b5719c9e9c2e98f0b26c0776974d372ab594e.zip
chromium_src-695b5719c9e9c2e98f0b26c0776974d372ab594e.tar.gz
chromium_src-695b5719c9e9c2e98f0b26c0776974d372ab594e.tar.bz2
Reland 171079, as it wasn't the CL that caused the perf regression
> Revert 171079 - investigating perf regression. > > > Make Blacklist::IsBlacklist asynchronous (it will need to be for safe > > browsing), and unravel the knots that result from it: > > - Decouple it from the admin policy. > > - Take the other half of blacklist logic out of ExtensionPrefs and into > > Blacklist. > > - Fix bug where blacklisted extensions couldn't be re-installed (let alone > > re-enabled) if they get taken off the blacklist. > > > > > > TBR=sky@chromium.org > > BUG=154149,156750 > > > > > > Review URL: https://chromiumcodereview.appspot.com/11415216 > > TBR=kalman@chromium.org > > Review URL: https://codereview.chromium.org/11478003 TBR=kalman@chromium.org Review URL: https://codereview.chromium.org/11465014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/protector/protected_prefs_watcher_unittest.cc')
-rw-r--r--chrome/browser/protector/protected_prefs_watcher_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/protector/protected_prefs_watcher_unittest.cc b/chrome/browser/protector/protected_prefs_watcher_unittest.cc
index f69b043..f67d7f7 100644
--- a/chrome/browser/protector/protected_prefs_watcher_unittest.cc
+++ b/chrome/browser/protector/protected_prefs_watcher_unittest.cc
@@ -132,9 +132,7 @@ TEST_F(ProtectedPrefsWatcherTest, ExtensionPrefChange) {
EXPECT_FALSE(IsSignatureValid());
// Blacklisting the extension does update the backup and signature.
- std::set<std::string> blacklist;
- blacklist.insert(sample_id);
- extension_prefs->UpdateBlacklist(blacklist);
+ extension_prefs->SetExtensionBlacklisted(sample_id, true);
EXPECT_TRUE(IsSignatureValid());
}