Index: chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc |
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc |
index e334630e24dd3d567c41ea76f441b1af2ee7a0c0..254b14ed038632b529c0536ec4c32034547269de 100644 |
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc |
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc |
@@ -7,14 +7,13 @@ |
#include "base/json/json_string_value_serializer.h" |
#include "base/sys_info.h" |
#include "chrome/browser/browser_process.h" |
-#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/sync/about_sync_util.h" |
#include "chrome/browser/sync/profile_sync_service_factory.h" |
#include "chrome/common/chrome_version_info.h" |
#include "content/public/browser/browser_thread.h" |
-#include "extensions/browser/extension_system.h" |
+#include "extensions/browser/extension_registry.h" |
#include "extensions/common/extension.h" |
#include "extensions/common/extension_set.h" |
@@ -109,17 +108,11 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs( |
if (!primary_profile) |
return; |
- ExtensionService* service = |
- extensions::ExtensionSystem::Get(primary_profile)->extension_service(); |
- if (!service) |
- return; |
- |
+ extensions::ExtensionRegistry* extension_registry = |
+ extensions::ExtensionRegistry::Get(primary_profile); |
std::string extensions_list; |
- const extensions::ExtensionSet* extensions = service->extensions(); |
- for (extensions::ExtensionSet::const_iterator it = extensions->begin(); |
- it != extensions->end(); |
- ++it) { |
- const extensions::Extension* extension = it->get(); |
+ for (const scoped_refptr<const extensions::Extension>& extension : |
+ extension_registry->enabled_extensions()) { |
if (extensions_list.empty()) { |
extensions_list = extension->name(); |
} else { |