Extension white and force lists (set by policy) should have priority over auto-updated Google black…

chrome/browser/protector/protected_prefs_watcher.cc

Index: chrome/browser/protector/protected_prefs_watcher.cc
diff --git a/chrome/browser/protector/protected_prefs_watcher.cc b/chrome/browser/protector/protected_prefs_watcher.cc
index 7c032cee428a3b419b5ed5763c1ea5fa089083d4..269635ce6d150136bc35e535289976717bcf639e 100644
--- a/chrome/browser/protector/protected_prefs_watcher.cc
+++ b/chrome/browser/protector/protected_prefs_watcher.cc
@@ -200,17 +200,8 @@ void ProtectedPrefsWatcher::EnsurePrefsMigration() {
 }
 
 bool ProtectedPrefsWatcher::UpdateCachedPrefs() {
-  // Direct access to the extensions prefs is required becase ExtensionService

[Ivan Korotkov, 2012/08/07 13:26:40]

Did something change in the initialization order? Are you sure that now
ExtensionPrefs is always initialized at this moment?

[qfel, 2012/08/07 13:43:51]

I guess I should have left the part about being uninitialized there. I just
moved the code below to ExtensionPrefs::GetExtensionsFrom (which is still a
static method), so ProtectedPrefsWatcher doesn't need to mess with extension
prefs directly (and GetExtensionsFrom uses PrefService now anyway). Nothing
changed in initialization order.

One thing I forgot to mention: now when there are no extension preferences set,
an empty set is returned (and still compared to cached_extension_ids_).
Previously it would always return false, even on non-empty 
cached_extension_ids_. Is that ok? I suppose no preference set at all should be
the same as empty dictionary, but here it was treated differently.

-  // may not yet have been initialized.
-  const base::DictionaryValue* extension_prefs;
-  const base::Value* extension_prefs_value =
-      profile_->GetPrefs()->GetUserPrefValue(ExtensionPrefs::kExtensionsPref);
-  if (!extension_prefs_value ||
-      !extension_prefs_value->GetAsDictionary(&extension_prefs)) {
-    return false;
-  }
   ExtensionPrefs::ExtensionIdSet extension_ids =
-      ExtensionPrefs::GetExtensionsFrom(extension_prefs);
+      ExtensionPrefs::GetExtensionsFrom(profile_->GetPrefs());
   if (extension_ids == cached_extension_ids_)
     return false;
   cached_extension_ids_.swap(extension_ids);