Replace the WAS_INSTALLED_BY_CUSTODIAN creation flag with a pref

chrome/browser/extensions/extension_util.cc

Index: chrome/browser/extensions/extension_util.cc
diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc
index 4a861653b6ebb4e3906532324f16a8e501d3f259..a397ef309bf43f9306f5d0fab0ce96f11dc63839 100644
--- a/chrome/browser/extensions/extension_util.cc
+++ b/chrome/browser/extensions/extension_util.cc
@@ -54,6 +54,10 @@ const char kExtensionAllowedOnAllUrlsPrefName[] =
 // allowed on all urls" pref.
 const char kHasSetScriptOnAllUrlsPrefName[] = "has_set_script_all_urls";
 
+// The entry into the prefs used to flag an extension as installed by custodian.
+// It is relevant only for supervised users
+const char kWasInstalledByCustodianPrefName[] = "was_installed_by_custodian";
+
 // Returns true if |extension| should always be enabled in incognito mode.
 bool IsWhitelistedForIncognito(const Extension* extension) {
   const Feature* feature = FeatureProvider::GetBehaviorFeature(
@@ -220,6 +224,36 @@ void SetAllowFileAccess(const std::string& extension_id,
   ReloadExtensionIfEnabled(extension_id, context);
 }
 
+void SetWasInstalledByCustodian(const std::string& extension_id,
+                                content::BrowserContext* context,
+                                bool installed_by_custodian) {
+  ExtensionPrefs::Get(context)->UpdateExtensionPref(
+      extension_id, kWasInstalledByCustodianPrefName,
+      new base::FundamentalValue(installed_by_custodian));
+  ExtensionRegistry* registry = ExtensionRegistry::Get(context);
+
+  // If it is already enabled, nothing to be done.

[Marc Treib, 2016/06/16 12:35:39]

This is assuming that |installed_by_custodian| is true, yes? If it can never be
set to false, then remove the parameter.

[mamir, 2016/06/17 08:33:18]

Yes.
It can never be set to false, but I left the parameter for consistency with
other methods.
I removed it.

+  if (registry->enabled_extensions().Contains(extension_id))
+    return;
+
+  // If the extension is not installed, it may need to be reloaded.

[Marc Treib, 2016/06/16 12:35:39]

Why?
Is there any situation where registry->GetInstalledExtension would return null,
but reloading will do anything?

[mamir, 2016/06/17 08:33:18]

Pre-installed extensions that get unloaded after Chrome knows it's a supervised
user.

[Marc Treib, 2016/06/17 08:56:54]

And in that case, GetInstalledExtension won't return it at all? Okay, maybe
mention that in the comment?
(I think GetInstalledExtension is really misnamed, making this super confusing
to read...)

[mamir, 2016/06/17 16:12:54]

Done.

+  const Extension* extension = registry->GetInstalledExtension(extension_id);
+  if (!extension) {
+    ExtensionService* service =
+        ExtensionSystem::Get(context)->extension_service();
+    service->ReloadExtension(extension_id);
+  }
+}
+
+bool WasInstalledByCustodian(const std::string& extension_id,
+                             content::BrowserContext* context) {
+  bool installed_by_custodian = false;
+  ExtensionPrefs* prefs = ExtensionPrefs::Get(context);
+  prefs->ReadPrefAsBoolean(extension_id, kWasInstalledByCustodianPrefName,
+                           &installed_by_custodian);
+  return installed_by_custodian;
+}
+
 bool AllowedScriptingOnAllUrls(const std::string& extension_id,
                                content::BrowserContext* context) {
   bool allowed = false;
@@ -378,8 +412,9 @@ bool CanHostedAppsOpenInWindows() {
 #endif
 }
 
-bool IsExtensionSupervised(const Extension* extension, const Profile* profile) {
-  return extension->was_installed_by_custodian() && profile->IsSupervised();
+bool IsExtensionSupervised(const Extension* extension, Profile* profile) {
+  return WasInstalledByCustodian(extension->id(), profile) &&
+         profile->IsSupervised();
 }
 
 bool NeedCustodianApprovalForPermissionIncrease(const Profile* profile) {