Revert of Don't install OEM default apps for enterprise 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 25 matching lines @@
 #include "extensions/common/manifest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
-#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
-#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user.h"
 #else
 #include "chrome/browser/extensions/default_apps.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/extensions/external_registry_loader_win.h"
 #endif
 
@@ skipping 166 matching lines @@
       const Extension* extension = extension_service ?
           extension_service->GetExtensionById(extension_id, true) : NULL;
       if (!extension) {
         unsupported_extensions.insert(extension_id);
         VLOG(1) << "Skip installing (or uninstall) external extension: "
                 << extension_id << " because the extension should be kept "
                 << "only if it is already installed.";
         continue;
       }
     }
-    if (!HandleInstalledByOem(extension, extension_id, &unsupported_extensions,
-                              &creation_flags))
-      continue;
-
+    bool was_installed_by_oem = false;
+    if (extension->GetBoolean(kWasInstalledByOem, &was_installed_by_oem) &&
+        was_installed_by_oem) {
+      creation_flags |= Extension::WAS_INSTALLED_BY_OEM;
+    }
     bool may_be_untrusted = false;
     if (extension->GetBoolean(kMayBeUntrusted, &may_be_untrusted) &&
         may_be_untrusted) {
       creation_flags |= Extension::MAY_BE_UNTRUSTED;
     }
 
-    if (!HandleMinProfileVersion(extension, extension_id,
-                                 &unsupported_extensions))
+    if (!ExternalProviderImpl::HandleMinProfileVersion(extension, extension_id,
+                                                       &unsupported_extensions))
       continue;
 
     std::string install_parameter;
     extension->GetString(kInstallParam, &install_parameter);
 
     if (has_external_crx) {
       if (crx_location_ == Manifest::INVALID_LOCATION) {
         LOG(WARNING) << "This provider does not support installing external "
                      << "extensions from crx files.";
         continue;
@@ skipping 130 matching lines @@
       VLOG(1) << "Skip installing (or uninstall) external extension: "
               << extension_id
               << " profile.created_by_version: " << profile_version.GetString()
               << " min_profile_created_by_version: "
               << min_profile_created_by_version;
       return false;
     }
   }
   return true;
 }
-
-bool ExternalProviderImpl::HandleInstalledByOem(
-    const base::DictionaryValue* extension,
-    const std::string& extension_id,
-    std::set<std::string>* unsupported_extensions,
-    int* creation_flags) {
-  bool was_installed_by_oem = false;
-  if (extension->GetBoolean(kWasInstalledByOem, &was_installed_by_oem) &&
-      was_installed_by_oem) {
-#if defined(OS_CHROMEOS)
-    policy::UserCloudPolicyManagerChromeOS* policy_manager =
-        policy::UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile_);
-    if (policy_manager && policy_manager->core()->store()->is_managed()) {
-      unsupported_extensions->insert(extension_id);
-      VLOG(1) << "Skip installing (or uninstall) external extension "
-              << extension_id << " installed by OEM for managed user";
-      return false;
-    }
-#endif
-    *creation_flags |= Extension::WAS_INSTALLED_BY_OEM;
-  }
-  return true;
-}
 
 // static
 void ExternalProviderImpl::CreateExternalProviders(
     VisitorInterface* service,
     Profile* profile,
     ProviderCollection* provider_list) {
   TRACE_EVENT0("browser,startup",
                "ExternalProviderImpl::CreateExternalProviders");
   scoped_refptr<ExternalLoader> external_loader;
   scoped_refptr<ExternalLoader> external_recommended_loader;
@@ skipping 212 matching lines @@
       new ExternalProviderImpl(
           service,
           new ExternalComponentLoader(profile),
           profile,
           Manifest::INVALID_LOCATION,
           Manifest::EXTERNAL_COMPONENT,
           Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
 }
 
 }  // namespace extensions