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

chrome/browser/extensions/extension_prefs_unittest.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 "extension_prefs_unittest.h"
 
 #include "base/basictypes.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
@@ skipping 461 matching lines @@
 
     // Install 5 extensions.
     for (int i = 0; i < 5; i++) {
       std::string name = "test" + base::IntToString(i);
       extensions_.push_back(prefs_.AddExtension(name));
     }
     EXPECT_EQ(NULL, prefs()->GetInstalledExtensionInfo(not_installed_id_));
 
     ExtensionList::const_iterator iter;
     for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) {
-      EXPECT_FALSE(prefs()->IsExtensionBlacklisted((*iter)->id()));
+      EXPECT_TRUE(prefs()->UserMayLoad(*iter, NULL));
     }
     // Blacklist one installed and one not-installed extension id.
     std::set<std::string> blacklisted_ids;
     blacklisted_ids.insert(extensions_[0]->id());
     blacklisted_ids.insert(not_installed_id_);
     prefs()->UpdateBlacklist(blacklisted_ids);
   }
 
   virtual void Verify() {
-    // Make sure the two id's we expect to be blacklisted are.
-    EXPECT_TRUE(prefs()->IsExtensionBlacklisted(extensions_[0]->id()));
-    EXPECT_TRUE(prefs()->IsExtensionBlacklisted(not_installed_id_));
+    // Make sure the id we expect to be blacklisted is.
+    EXPECT_FALSE(prefs()->UserMayLoad(extensions_[0], NULL));
 
     // Make sure the other id's are not blacklisted.
     ExtensionList::const_iterator iter;
-    for (iter = extensions_.begin() + 1; iter != extensions_.end(); ++iter) {
-      EXPECT_FALSE(prefs()->IsExtensionBlacklisted((*iter)->id()));
-    }
+    for (iter = extensions_.begin() + 1; iter != extensions_.end(); ++iter)
+      EXPECT_TRUE(prefs()->UserMayLoad(*iter, NULL));
 
     // Make sure GetInstalledExtensionsInfo returns only the non-blacklisted
     // extensions data.
     scoped_ptr<ExtensionPrefs::ExtensionsInfo> info(
         prefs()->GetInstalledExtensionsInfo());
     EXPECT_EQ(4u, info->size());
     ExtensionPrefs::ExtensionsInfo::iterator info_iter;
     for (info_iter = info->begin(); info_iter != info->end(); ++info_iter) {
       ExtensionInfo* extension_info = info_iter->get();
       EXPECT_NE(extensions_[0]->id(), extension_info->extension_id);
@@ skipping 746 matching lines @@
     EXPECT_EQ(string16(), error16);
     EXPECT_TRUE(prefs()->UserMayModifySettings(extension_.get(), &error16));
     EXPECT_EQ(string16(), error16);
     EXPECT_FALSE(prefs()->MustRemainEnabled(extension_.get(), &error16));
     EXPECT_EQ(string16(), error16);
   }
 };
 TEST_F(ExtensionPrefsNotRequiredExtension, NotRequiredExtension) {}
 
 }  // namespace extensions