Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / installed_loader.cc

diff --git a/src/chrome/browser/extensions/installed_loader.cc b/src/chrome/browser/extensions/installed_loader.cc
index 4a07ac7..141586c 100644 (file)
--- a/src/chrome/browser/extensions/installed_loader.cc
+++ b/src/chrome/browser/extensions/installed_loader.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h"
@@ -25,6 +24,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
@@ -117,8 +118,8 @@ BackgroundPageType GetBackgroundPageType(const Extension* extension) {
 
 InstalledLoader::InstalledLoader(ExtensionService* extension_service)
     : extension_service_(extension_service),
-      extension_prefs_(extension_service->extension_prefs()) {
-}
+      extension_registry_(ExtensionRegistry::Get(extension_service->profile())),
+      extension_prefs_(extension_service->extension_prefs()) {}
 
 InstalledLoader::~InstalledLoader() {
 }
@@ -253,9 +254,9 @@ void InstalledLoader::LoadAllExtensions() {
                            reload_reason_counts[NEEDS_RELOCALIZATION]);
 
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadAll",
-                           extension_service_->extensions()->size());
+                           extension_registry_->enabled_extensions().size());
   UMA_HISTOGRAM_COUNTS_100("Extensions.Disabled",
-                           extension_service_->disabled_extensions()->size());
+                           extension_registry_->disabled_extensions().size());
 
   UMA_HISTOGRAM_TIMES("Extensions.LoadAllTime",
                       base::TimeTicks::Now() - start_time);
@@ -275,9 +276,9 @@ void InstalledLoader::LoadAllExtensions() {
   int disabled_for_permissions_count = 0;
   int item_user_count = 0;
   int non_webstore_ntp_override_count = 0;
-  const ExtensionSet* extensions = extension_service_->extensions();
+  const ExtensionSet& extensions = extension_registry_->enabled_extensions();
   ExtensionSet::const_iterator ex;
-  for (ex = extensions->begin(); ex != extensions->end(); ++ex) {
+  for (ex = extensions.begin(); ex != extensions.end(); ++ex) {
     Manifest::Location location = (*ex)->location();
     Manifest::Type type = (*ex)->GetType();
     if ((*ex)->is_app()) {
@@ -407,10 +408,10 @@ void InstalledLoader::LoadAllExtensions() {
         ex->get(), "Extensions.Permissions_Load");
   }
 
-  const ExtensionSet* disabled_extensions =
-      extension_service_->disabled_extensions();
-  for (ex = disabled_extensions->begin();
-       ex != disabled_extensions->end(); ++ex) {
+  const ExtensionSet& disabled_extensions =
+      extension_registry_->disabled_extensions();
+  for (ex = disabled_extensions.begin(); ex != disabled_extensions.end();
+       ++ex) {
     if (extension_service_->extension_prefs()->
         DidExtensionEscalatePermissions((*ex)->id())) {
       ++disabled_for_permissions_count;