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

chrome/browser/extensions/extension_service.h

Index: chrome/browser/extensions/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 71ee1c2d1585287dc9bf0b55661968e5c2910088..120f1c8909b8698d23aa9b48dafa745eff008d4f 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -119,7 +119,7 @@ class ExtensionServiceInterface : public syncer::SyncableService {
 
   virtual void UpdateExtensionBlacklist(
     const std::vector<std::string>& blacklist) = 0;
-  virtual void CheckAdminBlacklist() = 0;
+  virtual void CheckManagementPolicy() = 0;
 
   // Safe to call multiple times in a row.
   //
@@ -411,10 +411,10 @@ class ExtensionService
   virtual void UpdateExtensionBlacklist(
       const std::vector<std::string>& blacklist) OVERRIDE;
 
-  // Go through each extension and unload those that the network admin has
-  // put on the blacklist (not to be confused with the Google-managed blacklist)
-  // set of extensions.
-  virtual void CheckAdminBlacklist() OVERRIDE;
+  // Go through each extension and unload those that are not allowed to run by
+  // management policy providers (ie. network admin and Google-managed
+  // blacklist).
+  virtual void CheckManagementPolicy() OVERRIDE;
 
   virtual void CheckForUpdatesSoon() OVERRIDE;