Prevent console spam about missing 'state' pref

BUG=71612
TEST=Start Chrome and see whether it prints a line "Bad or missing pref 'state' for extension ...".

Review URL: http://codereview.chromium.org/6447004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74815 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 10 deletions

diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 4bc61a8..c358dd6 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -1168,14 +1168,14 @@ base::Time ExtensionPrefs::GetInstallTime(
   return base::Time::FromInternalValue(install_time_i64);
 }
 
-void ExtensionPrefs::GetExtensions(ExtensionIdSet* out) const {
+void ExtensionPrefs::GetExtensions(ExtensionIdSet* out) {
   CHECK(out);
-  const DictionaryValue* extensions =
-      pref_service()->GetDictionary(kExtensionsPref);
 
-  for (DictionaryValue::key_iterator ext_id = extensions->begin_keys();
-       ext_id != extensions->end_keys(); ++ext_id) {
-    out->push_back(*ext_id);
+  scoped_ptr<ExtensionsInfo> extensions_info(GetInstalledExtensionsInfo());
+
+  for (size_t i = 0; i < extensions_info->size(); ++i) {
+    ExtensionInfo* info = extensions_info->at(i).get();
+    out->push_back(info->extension_id);
   }
 }
 
diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h
index 9a8cdac..12ed88a 100644
--- a/chrome/browser/extensions/extension_prefs.h
+++ b/chrome/browser/extensions/extension_prefs.h
@@ -109,7 +109,7 @@ class ExtensionPrefs {
   void SetExtensionState(const Extension* extension, Extension::State);
 
   // Returns all installed extensions
-  void GetExtensions(ExtensionIdSet* out) const;
+  void GetExtensions(ExtensionIdSet* out);
 
   // Getter and setter for browser action visibility.
   bool GetBrowserActionVisibility(const Extension* extension);
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index e11a385..910ee0f 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -567,13 +567,13 @@ class ExtensionPrefsPreferencesBase : public ExtensionPrefsTest {
     simple_dict.SetString(keys::kName, "unused");
 
     ext1_scoped_ = Extension::Create(
-        prefs_.temp_dir().AppendASCII("ext1_"), Extension::INVALID,
+        prefs_.temp_dir().AppendASCII("ext1_"), Extension::EXTERNAL_PREF,
         simple_dict, false, &error);
     ext2_scoped_ = Extension::Create(
-        prefs_.temp_dir().AppendASCII("ext2_"), Extension::INVALID,
+        prefs_.temp_dir().AppendASCII("ext2_"), Extension::EXTERNAL_PREF,
         simple_dict, false, &error);
     ext3_scoped_ = Extension::Create(
-        prefs_.temp_dir().AppendASCII("ext3_"), Extension::INVALID,
+        prefs_.temp_dir().AppendASCII("ext3_"), Extension::EXTERNAL_PREF,
         simple_dict, false, &error);
 
     ext1_ = ext1_scoped_.get();