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

BUG=93246
TEST=unit_tests

Review URL: https://chromiumcodereview.appspot.com/10854009

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

1 files changed, 3 insertions, 10 deletions

diff --git a/chrome/browser/protector/protected_prefs_watcher.cc b/chrome/browser/protector/protected_prefs_watcher.cc
index 46ac3a3..e51ffd8 100644
--- a/chrome/browser/protector/protected_prefs_watcher.cc
+++ b/chrome/browser/protector/protected_prefs_watcher.cc
@@ -200,17 +200,10 @@ void ProtectedPrefsWatcher::EnsurePrefsMigration() {
 }
 
 bool ProtectedPrefsWatcher::UpdateCachedPrefs() {
-  // Direct access to the extensions prefs is required becase ExtensionService
-  // 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;
-  }
+  // ExtensionService may not yet have been initialized, so using static method
+  // exposed for this purpose.
   ExtensionPrefs::ExtensionIds extension_ids =
-      ExtensionPrefs::GetExtensionsFrom(extension_prefs);
+      ExtensionPrefs::GetExtensionsFrom(profile_->GetPrefs());
   if (extension_ids == cached_extension_ids_)
     return false;
   cached_extension_ids_.swap(extension_ids);