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

chrome/browser/notifications/desktop_notification_service.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/notifications/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
@@ skipping 22 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/show_desktop_notification_params.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notifier_settings.h"
@@ skipping 454 matching lines @@
 base::string16 DesktopNotificationService::DisplayNameForOriginInProcessId(
     const GURL& origin, int process_id) {
   // If the source is an extension, lookup the display name.
   // Message center prefers to use extension name if the notification
   // is allowed by an extension.
   if (NotificationUIManager::DelegatesToMessageCenter() ||
       origin.SchemeIs(extensions::kExtensionScheme)) {
     extensions::InfoMap* extension_info_map =
         extensions::ExtensionSystem::Get(profile_)->info_map();
     if (extension_info_map) {
-      ExtensionSet extensions;
+      extensions::ExtensionSet extensions;
       extension_info_map->GetExtensionsWithAPIPermissionForSecurityOrigin(
           origin, process_id, extensions::APIPermission::kNotification,
           &extensions);
-      for (ExtensionSet::const_iterator iter = extensions.begin();
+      for (extensions::ExtensionSet::const_iterator iter = extensions.begin();
            iter != extensions.end(); ++iter) {
         NotifierId notifier_id(NotifierId::APPLICATION, (*iter)->id());
         if (IsNotifierEnabled(notifier_id))
           return UTF8ToUTF16((*iter)->name());
       }
     }
   }
   return UTF8ToUTF16(origin.host());
 }
 
@@ skipping 141 matching lines @@
   // Tell the IO thread that this extension's permission for notifications
   // has changed.
   extensions::InfoMap* extension_info_map =
       extensions::ExtensionSystem::Get(profile_)->info_map();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&extensions::InfoMap::SetNotificationsDisabled,
                  extension_info_map, notifier_id.id, !enabled));
 
 }