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

chrome/browser/extensions/admin_policy_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 "chrome/browser/extensions/admin_policy.h"
 
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 32 matching lines @@
   EXPECT_TRUE(ap::BlacklistedByDefault(&blacklist));
 
   blacklist.Clear();
   blacklist.Append(Value::CreateStringValue("*"));
   EXPECT_TRUE(ap::BlacklistedByDefault(&blacklist));
 }
 
 // Tests UserMayLoad for required extensions.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadRequired) {
   CreateExtension(Extension::EXTERNAL_POLICY_DOWNLOAD, true);
-  EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, extension_.get(), NULL));
+  EXPECT_TRUE(ap::UserMayLoad(false, NULL, NULL, NULL, extension_.get(), NULL));
   string16 error;
-  EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, extension_.get(), &error));
+  EXPECT_TRUE(ap::UserMayLoad(false, NULL, NULL, NULL, extension_.get(),
+                              &error));
   EXPECT_TRUE(error.empty());
 
   // Required extensions may load even if they're on the blacklist.

[Mattias Nissler (ping if slow), 2012/08/13 16:54:53]

add tests here and below to make sure the admin blacklist works as expected?

   base::ListValue blacklist;
   blacklist.Append(Value::CreateStringValue(extension_->id()));
-  EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, extension_.get(), NULL));
+  EXPECT_TRUE(ap::UserMayLoad(false, &blacklist, NULL, NULL, extension_.get(),
+                              NULL));
 
   blacklist.Append(Value::CreateStringValue("*"));
-  EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, extension_.get(), NULL));
+  EXPECT_TRUE(ap::UserMayLoad(false, &blacklist, NULL, NULL, extension_.get(),
+                              NULL));
 }
 
 // Tests UserMayLoad when no blacklist exists, or it's empty.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadNoBlacklist) {
   CreateExtension(Extension::INTERNAL, false);
-  EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, extension_.get(), NULL));
+  EXPECT_TRUE(ap::UserMayLoad(false, NULL, NULL, NULL, extension_.get(), NULL));
   base::ListValue blacklist;
-  EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, extension_.get(), NULL));
+  EXPECT_TRUE(ap::UserMayLoad(false, &blacklist, NULL, NULL, extension_.get(),
+                              NULL));
   string16 error;
-  EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, extension_.get(), &error));
+  EXPECT_TRUE(ap::UserMayLoad(false, &blacklist, NULL, NULL, extension_.get(),
+                              &error));
   EXPECT_TRUE(error.empty());
 }
 
 // Tests UserMayLoad for an extension on the whitelist.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadWhitelisted) {
   CreateExtension(Extension::INTERNAL, false);
 
   base::ListValue whitelist;
   whitelist.Append(Value::CreateStringValue(extension_->id()));
-  EXPECT_TRUE(ap::UserMayLoad(NULL, &whitelist, extension_.get(), NULL));
+  EXPECT_TRUE(ap::UserMayLoad(false, NULL, &whitelist, NULL, extension_.get(),
+                              NULL));
 
   base::ListValue blacklist;
   blacklist.Append(Value::CreateStringValue(extension_->id()));
-  EXPECT_TRUE(ap::UserMayLoad(NULL, &whitelist, extension_.get(), NULL));
+  EXPECT_TRUE(ap::UserMayLoad(false, NULL, &whitelist, NULL, extension_.get(),
+                              NULL));
   string16 error;
-  EXPECT_TRUE(ap::UserMayLoad(NULL, &whitelist, extension_.get(), &error));
+  EXPECT_TRUE(ap::UserMayLoad(false, NULL, &whitelist, NULL, extension_.get(),
+                              &error));
   EXPECT_TRUE(error.empty());
 }
 
 // Tests UserMayLoad for an extension on the blacklist.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadBlacklisted) {
   CreateExtension(Extension::INTERNAL, false);
 
   // Blacklisted by default.
   base::ListValue blacklist;
   blacklist.Append(Value::CreateStringValue("*"));
-  EXPECT_FALSE(ap::UserMayLoad(&blacklist, NULL, extension_.get(), NULL));
+  EXPECT_FALSE(ap::UserMayLoad(false, &blacklist, NULL, NULL, extension_.get(),
+                               NULL));
   string16 error;
-  EXPECT_FALSE(ap::UserMayLoad(&blacklist, NULL, extension_.get(), &error));
+  EXPECT_FALSE(ap::UserMayLoad(false, &blacklist, NULL, NULL, extension_.get(),
+                               &error));
   EXPECT_FALSE(error.empty());
 
   // Extension on the blacklist, with and without wildcard.
   blacklist.Append(Value::CreateStringValue(extension_->id()));
-  EXPECT_FALSE(ap::UserMayLoad(&blacklist, NULL, extension_.get(), NULL));
+  EXPECT_FALSE(ap::UserMayLoad(false, &blacklist, NULL, NULL, extension_.get(),
+                               NULL));
   blacklist.Clear();
   blacklist.Append(Value::CreateStringValue(extension_->id()));
-  EXPECT_FALSE(ap::UserMayLoad(&blacklist, NULL, extension_.get(), NULL));
+  EXPECT_FALSE(ap::UserMayLoad(false, &blacklist, NULL, NULL, extension_.get(),
+                               NULL));
 
   // With a whitelist. There's no such thing as a whitelist wildcard.
   base::ListValue whitelist;
   whitelist.Append(
       Value::CreateStringValue("behllobkkfkfnphdnhnkndlbkcpglgmj"));
-  EXPECT_FALSE(ap::UserMayLoad(&blacklist, &whitelist, extension_.get(), NULL));
+  EXPECT_FALSE(ap::UserMayLoad(false, &blacklist, &whitelist, NULL,
+                               extension_.get(), NULL));
   whitelist.Append(Value::CreateStringValue("*"));
-  EXPECT_FALSE(ap::UserMayLoad(&blacklist, &whitelist, extension_.get(), NULL));
+  EXPECT_FALSE(ap::UserMayLoad(false, &blacklist, &whitelist, NULL,
+                               extension_.get(), NULL));
 }
 
 TEST_F(ExtensionAdminPolicyTest, UserMayModifySettings) {
   CreateExtension(Extension::INTERNAL, false);
   EXPECT_TRUE(ap::UserMayModifySettings(extension_.get(), NULL));
   string16 error;
   EXPECT_TRUE(ap::UserMayModifySettings(extension_.get(), &error));
   EXPECT_TRUE(error.empty());
 
   CreateExtension(Extension::EXTERNAL_POLICY_DOWNLOAD, true);
   error.clear();
   EXPECT_FALSE(ap::UserMayModifySettings(extension_.get(), NULL));
   EXPECT_FALSE(ap::UserMayModifySettings(extension_.get(), &error));
   EXPECT_FALSE(error.empty());
 }
 
 TEST_F(ExtensionAdminPolicyTest, MustRemainEnabled) {
   CreateExtension(Extension::EXTERNAL_POLICY_DOWNLOAD, true);
   EXPECT_TRUE(ap::MustRemainEnabled(extension_.get(), NULL));
   string16 error;
   EXPECT_TRUE(ap::MustRemainEnabled(extension_.get(), &error));
   EXPECT_FALSE(error.empty());
 
   CreateExtension(Extension::INTERNAL, false);
   error.clear();
   EXPECT_FALSE(ap::MustRemainEnabled(extension_.get(), NULL));
   EXPECT_FALSE(ap::MustRemainEnabled(extension_.get(), &error));
   EXPECT_TRUE(error.empty());
 }