Supervised Users Initiated Installs v2

chrome/browser/extensions/extension_util.cc

 // Copyright 2013 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/extension_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/values.h"
@@ skipping 217 matching lines @@
 
 void SetWasInstalledByCustodian(const std::string& extension_id,
                                 content::BrowserContext* context,
                                 bool installed_by_custodian) {
   if (installed_by_custodian == WasInstalledByCustodian(extension_id, context))
     return;
 
   ExtensionPrefs::Get(context)->UpdateExtensionPref(
       extension_id, kWasInstalledByCustodianPrefName,
       installed_by_custodian ? new base::FundamentalValue(true) : nullptr);
-  ExtensionRegistry* registry = ExtensionRegistry::Get(context);
-  const Extension* extension = registry->GetInstalledExtension(extension_id);
   ExtensionService* service =
       ExtensionSystem::Get(context)->extension_service();
 
-  // If the installed_by_custodian flag is reset, do nothing.
   if (!installed_by_custodian) {
     // If installed_by_custodian changes to false, the extension may need to
     // be unloaded now.
     service->ReloadExtension(extension_id);
     return;
   }
 
+  ExtensionRegistry* registry = ExtensionRegistry::Get(context);
   // If it is already enabled, do nothing.
   if (registry->enabled_extensions().Contains(extension_id))
     return;
 
   // If the extension is not loaded, it may need to be reloaded.
   // Example is a pre-installed extension that was unloaded when a
   // supervised user flag has been received.
-  if (!extension) {
+  if (!registry->GetInstalledExtension(extension_id)) {
     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);
@@ skipping 170 matching lines @@
   base::FieldTrialList::FindFullName(
       kSupervisedUserExtensionPermissionIncreaseFieldTrialName);
   std::string value = variations::GetVariationParamValue(
       kSupervisedUserExtensionPermissionIncreaseFieldTrialName,
       profile->IsChild() ? "child_account" : "legacy_supervised_user");
   return value == "true";
 }
 
 }  // namespace util
 }  // namespace extensions