Decouple killbit testing from external extension providers

chrome/browser/extensions/extension_prefs.cc

 // Copyright (c) 2010 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 "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 595 matching lines @@
   return launch_container;
 }
 
 void ExtensionPrefs::SetLaunchType(const std::string& extension_id,
                                    LaunchType launch_type) {
   UpdateExtensionPref(extension_id, kPrefLaunchType,
       Value::CreateIntegerValue(static_cast<int>(launch_type)));
   SavePrefsAndNotify();
 }
 
-void ExtensionPrefs::GetKilledExtensionIds(std::set<std::string>* killed_ids) {
-  const DictionaryValue* dict = prefs_->GetDictionary(kExtensionsPref);
-  if (!dict || dict->empty())
-    return;
-
-  for (DictionaryValue::key_iterator i = dict->begin_keys();
-       i != dict->end_keys(); ++i) {
-    const std::string& key_name(*i);
-    if (!Extension::IdIsValid(key_name)) {
-      LOG(WARNING) << "Invalid external extension ID encountered: " << key_name;
-      continue;
-    }
-
-    DictionaryValue* extension;
-    if (!dict->GetDictionary(key_name, &extension)) {
-      NOTREACHED();
-      continue;
-    }
-
-    // Check to see if the extension has been killed.
-    int state;
-    if (extension->GetInteger(kPrefState, &state) &&
-        state == static_cast<int>(Extension::KILLBIT)) {
-      killed_ids->insert(StringToLowerASCII(key_name));
-    }
-  }
+bool ExtensionPrefs::IsExtensionKilled(const std::string& id) {
+  DictionaryValue* extension = GetExtensionPref(id);
+  if (!extension)
+    return false;
+  int state;

[Aaron Boodman, 2010/12/03 21:50:27]

please initialize primitives

[gfeher, 2010/12/06 16:21:26]

Done.

+  return extension->GetInteger(kPrefState, &state) &&
+         state == static_cast<int>(Extension::KILLBIT);
 }
 
 std::vector<std::string> ExtensionPrefs::GetToolbarOrder() {
   std::vector<std::string> extension_ids;
   const ListValue* toolbar_order = prefs_->GetList(kExtensionToolbar);
   if (toolbar_order) {
     for (size_t i = 0; i < toolbar_order->GetSize(); ++i) {
       std::string extension_id;
       if (toolbar_order->GetString(i, &extension_id))
         extension_ids.push_back(extension_id);
@@ skipping 441 matching lines @@
 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionsPref);
   prefs->RegisterListPref(kExtensionToolbar);
   prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize, -1);
   prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate);
   prefs->RegisterListPref(prefs::kExtensionInstallAllowList);
   prefs->RegisterListPref(prefs::kExtensionInstallDenyList);
   prefs->RegisterListPref(prefs::kExtensionInstallForceList);
   prefs->RegisterStringPref(kWebStoreLogin, std::string() /* default_value */);
 }