Move c/c/e/extension_set to top-level extensions/

chrome/browser/content_settings/content_settings_internal_extension_provider.cc

Index: chrome/browser/content_settings/content_settings_internal_extension_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
index 59f5d33cc63ad0be494b77f6b4ff4799fb1fb1ef..d1c977f7765299debed0287a9b633417667c38d6 100644
--- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
+++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
@@ -12,13 +12,13 @@
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/features/simple_feature.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 
 using extensions::UnloadedExtensionInfo;
 
@@ -28,8 +28,8 @@ InternalExtensionProvider::InternalExtensionProvider(
     ExtensionService* extension_service)
     : registrar_(new content::NotificationRegistrar) {
   // Whitelist all extensions loaded so far.
-  const ExtensionSet* extensions = extension_service->extensions();
-  for (ExtensionSet::const_iterator it = extensions->begin();
+  const extensions::ExtensionSet* extensions = extension_service->extensions();
+  for (extensions::ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     if (extensions::PluginInfo::HasPlugins(it->get()))
       SetContentSettingForExtension(it->get(), CONTENT_SETTING_ALLOW);