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

chrome/browser/extensions/admin_policy.h

Index: chrome/browser/extensions/admin_policy.h
diff --git a/chrome/browser/extensions/admin_policy.h b/chrome/browser/extensions/admin_policy.h
index 38ff9325a51b5f04857d9bbbaccb003fcb047477..5d69d07d2b0424cbab0790bce839e0aa6aa4e52c 100644
--- a/chrome/browser/extensions/admin_policy.h
+++ b/chrome/browser/extensions/admin_policy.h
@@ -22,10 +22,12 @@ namespace admin_policy {
 // from the command line, or when loaded as an unpacked extension).
 bool BlacklistedByDefault(const base::ListValue* blacklist);
 
-// Returns true if the extension is allowed by admin policy white- and
-// blacklists.
-bool UserMayLoad(const base::ListValue* blacklist,
+// Returns true if the extension is allowed by Google blacklist and admin policy
+// white-, black- and forcelists.
+bool UserMayLoad(bool is_google_blacklisted,
+                 const base::ListValue* blacklist,
                  const base::ListValue* whitelist,
+                 const base::ListValue* forcelist,
                  const Extension* extension,
                  string16* error);