Revert of Reenable disabled component extensions with profile resetter.

chrome/browser/profile_resetter/profile_resetter.cc

 // Copyright (c) 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/profile_resetter/profile_resetter.h"
 
 #include <stddef.h>
 
 #include <string>
-#include <vector>
 
 #include "base/macros.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "build/build_config.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
@@ skipping 10 matching lines @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/browser/website_settings_info.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/browser_thread.h"
-#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/management_policy.h"
-#include "extensions/common/extension_id.h"
-#include "extensions/common/manifest.h"
 
 #if defined(OS_WIN)
 #include "base/base_paths.h"
 #include "base/path_service.h"
 #include "chrome/installer/util/shell_util.h"
 
 namespace {
 
 void ResetShortcutsOnFileThread() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
@@ skipping 212 matching lines @@
   DCHECK(CalledOnValidThread());
 
   std::vector<std::string> brandcode_extensions;
   master_settings_->GetExtensions(&brandcode_extensions);
 
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   DCHECK(extension_service);
   extension_service->DisableUserExtensionsExcept(brandcode_extensions);
 
-  // Reenable all disabled external component extensions.
-  // BrandcodedDefaultSettings does not contain information about component
-  // extensions, so fetch them from the existing registry. This may be not very
-  // robust, as the profile resetter may be invoked when the registry is in some
-  // iffy state. However, we can't enable an extension which is not in the
-  // registry anyway.
-  extensions::ExtensionRegistry* extension_registry =
-      extensions::ExtensionRegistry::Get(profile_);
-  DCHECK(extension_registry);
-  std::vector<extensions::ExtensionId> extension_ids_to_reenable;
-  for (const auto& extension : extension_registry->disabled_extensions()) {
-    if (extension->location() == extensions::Manifest::EXTERNAL_COMPONENT)
-      extension_ids_to_reenable.push_back(extension->id());
-  }
-  for (const auto& extension_id : extension_ids_to_reenable) {
-    extension_service->EnableExtension(extension_id);
-  }
-
   MarkAsDone(EXTENSIONS);
 }
 
 void ProfileResetter::ResetStartupPages() {
   DCHECK(CalledOnValidThread());
   PrefService* prefs = profile_->GetPrefs();
   DCHECK(prefs);
   std::unique_ptr<base::ListValue> url_list(
       master_settings_->GetUrlsToRestoreOnStartup());
   if (url_list)
@@ skipping 75 matching lines @@
         chrome_exe,
         false,
         cancel,
         &shortcuts);
   }
   return shortcuts;
 #else
   return std::vector<ShortcutCommand>();
 #endif
 }