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

chrome/browser/notifications/message_center_settings_controller.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/notifications/message_center_settings_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/string_compare.h"
@@ skipping 174 matching lines @@
   DesktopNotificationService* notification_service =
       DesktopNotificationServiceFactory::GetForProfile(profile);
 
   UErrorCode error;
   scoped_ptr<icu::Collator> collator(icu::Collator::createInstance(error));
   scoped_ptr<NotifierComparator> comparator;
   if (!U_FAILURE(error))
     comparator.reset(new NotifierComparator(collator.get()));
 
   ExtensionService* extension_service = profile->GetExtensionService();
-  const ExtensionSet* extension_set = extension_service->extensions();
+  const extensions::ExtensionSet* extension_set =
+      extension_service->extensions();
   // The extension icon size has to be 32x32 at least to load bigger icons if
   // the icon doesn't exist for the specified size, and in that case it falls
   // back to the default icon. The fetched icon will be resized in the settings
   // dialog. See chrome/browser/extensions/extension_icon_image.cc and
   // crbug.com/222931
   app_icon_loader_.reset(new extensions::AppIconLoaderImpl(
       profile, extension_misc::EXTENSION_ICON_SMALL, this));
-  for (ExtensionSet::const_iterator iter = extension_set->begin();
+  for (extensions::ExtensionSet::const_iterator iter = extension_set->begin();
        iter != extension_set->end();
        ++iter) {
     const extensions::Extension* extension = iter->get();
     if (!extension->HasAPIPermission(
             extensions::APIPermission::kNotification)) {
       continue;
     }
 
     NotifierId notifier_id(NotifierId::APPLICATION, extension->id());
     notifiers->push_back(new Notifier(
@@ skipping 257 matching lines @@
 
     // In ChromeOS, the login screen first creates a dummy profile which is not
     // actually used, and then the real profile for the user is created when
     // login (or turns into kiosk mode). This profile should be skipped.
     if (chromeos::ProfileHelper::IsSigninProfile(group->profile()))
       continue;
 #endif
     notifier_groups_.push_back(group.release());
   }
 }