Register external extension providers also for supervised users

chrome/browser/extensions/external_provider_impl.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/external_provider_impl.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 480 matching lines @@
         chromeos::ServicesCustomizationDocument::GetInstance();
     provider_list->push_back(linked_ptr<ExternalProviderInterface>(
         new ExternalProviderImpl(service,
                                  customization->CreateExternalLoader(profile),
                                  profile,
                                  Manifest::EXTERNAL_PREF,
                                  Manifest::EXTERNAL_PREF_DOWNLOAD,
                                  oem_extension_creation_flags)));
   }
 #elif defined(OS_LINUX)
-  if (!profile->IsSupervised()) {
+  if (!profile->IsLegacySupervised()) {
     provider_list->push_back(
         linked_ptr<ExternalProviderInterface>(
             new ExternalProviderImpl(
                 service,
                 new ExternalPrefLoader(
                     chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
                     ExternalPrefLoader::NONE,
                     NULL),
                 profile,
                 Manifest::EXTERNAL_PREF,
                 Manifest::EXTERNAL_PREF_DOWNLOAD,
                 bundled_extension_creation_flags)));
   }
 #endif
 
-  if (!profile->IsSupervised()) {
+  if (!profile->IsLegacySupervised()) {
 #if defined(OS_WIN)
     provider_list->push_back(
         linked_ptr<ExternalProviderInterface>(
             new ExternalProviderImpl(
                 service,
                 new ExternalRegistryLoader,
                 profile,
                 Manifest::EXTERNAL_REGISTRY,
                 Manifest::EXTERNAL_PREF_DOWNLOAD,
                 Extension::NO_FLAGS)));
@@ skipping 35 matching lines @@
                 profile,
                 service,
                 new ExternalPrefLoader(chrome::DIR_DEFAULT_APPS,
                                        ExternalPrefLoader::NONE,
                                        NULL),
                 Manifest::INTERNAL,
                 Manifest::INTERNAL,
                 Extension::FROM_WEBSTORE |
                     Extension::WAS_INSTALLED_BY_DEFAULT)));
 #endif
+  }
 
-    provider_list->push_back(
-      linked_ptr<ExternalProviderInterface>(
-        new ExternalProviderImpl(
-            service,
-            new ExternalComponentLoader(profile),
-            profile,
-            Manifest::INVALID_LOCATION,
-            Manifest::EXTERNAL_COMPONENT,
-            Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
-  }
+  provider_list->push_back(
+    linked_ptr<ExternalProviderInterface>(
+      new ExternalProviderImpl(
+          service,
+          new ExternalComponentLoader(profile),
+          profile,
+          Manifest::INVALID_LOCATION,
+          Manifest::EXTERNAL_COMPONENT,
+          Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
 }
 
 }  // namespace extensions