Enable/disable extensions upon changes in blacklist.

chrome/browser/extensions/extension_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_prefs.h"
 
 #include <iterator>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_notifier.h"
@@ skipping 49 matching lines @@
 
 // The dictionary containing the extension's manifest.
 const char kPrefManifest[] = "manifest";
 
 // The version number.
 const char kPrefVersion[] = "manifest.version";
 
 // Indicates whether an extension is blacklisted.
 const char kPrefBlacklist[] = "blacklist";
 
+// If extension is greylisted.
+const char kPrefGreylist[] = "greylist";
+
 // The count of how many times we prompted the user to acknowledge an
 // extension.
 const char kPrefAcknowledgePromptCount[] = "ack_prompt_count";
 
 // Indicates whether the user has acknowledged various types of extensions.
 const char kPrefExternalAcknowledged[] = "ack_external";
 const char kPrefBlacklistAcknowledged[] = "ack_blacklist";
 const char kPrefWipeoutAcknowledged[] = "ack_wiped";
 
 // Indicates whether the external extension was installed during the first
@@ skipping 1060 matching lines @@
 
 void ExtensionPrefs::SetExtensionState(const std::string& extension_id,
                                        Extension::State state) {
   UpdateExtensionPref(extension_id, kPrefState,
                       new base::FundamentalValue(state));
   bool enabled = (state == Extension::ENABLED);
   extension_pref_value_map_->SetExtensionState(extension_id, enabled);
   content_settings_store_->SetExtensionState(extension_id, enabled);
 }
 
+void ExtensionPrefs::SetExtensionBlacklistState(const std::string& extension_id,
+                                                BlacklistState state) {
+  SetExtensionBlacklisted(extension_id, state == BLACKLISTED_MALWARE);
+  UpdateExtensionPref(extension_id, kPrefGreylist,
+                      new base::FundamentalValue(state));
+}
+
+BlacklistState ExtensionPrefs::GetExtensionBlacklistState(
+    const std::string& extension_id) {
+  if (IsExtensionBlacklisted(extension_id))
+    return BLACKLISTED_MALWARE;
+  const base::DictionaryValue* ext_prefs = GetExtensionPref(extension_id);
+  int int_value;
+  if (ext_prefs && ext_prefs->GetInteger(kPrefGreylist, &int_value))

[not at google - send to devlin, 2014/01/22 22:24:39]

"greylist" seems like a misnomer now [that this is just generic "blacklist
state"]?

[Oleg Eterevsky, 2014/01/23 14:48:54]

Done.

+    return static_cast<BlacklistState>(int_value);
+  else

[not at google - send to devlin, 2014/01/22 22:24:39]

no else after return.

[Oleg Eterevsky, 2014/01/23 14:48:54]

Done.

+    return NOT_BLACKLISTED;

[not at google - send to devlin, 2014/01/22 22:24:39]

could you test this logic in extension_prefs_unittest.cc? just the way that the
IsExtensionBlacklisted takes priority and all that. should be simple enough.

[Oleg Eterevsky, 2014/01/23 14:48:54]

Done.

+}
+
 std::string ExtensionPrefs::GetVersionString(const std::string& extension_id) {
   const base::DictionaryValue* extension = GetExtensionPref(extension_id);
   if (!extension)
     return std::string();
 
   std::string version;
   extension->GetString(kPrefVersion, &version);
 
   return version;
 }
@@ skipping 724 matching lines @@
     is_enabled = initial_state == Extension::ENABLED;
   }
 
   extension_pref_value_map_->RegisterExtension(extension_id, install_time,
                                                is_enabled);
   content_settings_store_->RegisterExtension(extension_id, install_time,
                                              is_enabled);
 }
 
 }  // namespace extensions