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

chrome/browser/background/background_application_list_model.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/background/background_application_list_model.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/sha1.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_resource.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 using extensions::APIPermission;
 using extensions::Extension;
 using extensions::ExtensionList;
 using extensions::PermissionSet;
@@ skipping 39 matching lines @@
   void RequestIcon(extension_misc::ExtensionIcons size);
 
   const Extension* extension_;
   scoped_ptr<gfx::ImageSkia> icon_;
   BackgroundApplicationListModel* model_;
 };
 
 namespace {
 void GetServiceApplications(ExtensionService* service,
                             ExtensionList* applications_result) {
-  const ExtensionSet* extensions = service->extensions();
+  const extensions::ExtensionSet* extensions = service->extensions();
 
-  for (ExtensionSet::const_iterator cursor = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator cursor = extensions->begin();
        cursor != extensions->end();
        ++cursor) {
     const Extension* extension = cursor->get();
     if (BackgroundApplicationListModel::IsBackgroundApp(*extension,
                                                         service->profile())) {
       applications_result->push_back(extension);
     }
   }
 
   // Walk the list of terminated extensions also (just because an extension
   // crashed doesn't mean we should ignore it).
   extensions = service->terminated_extensions();
-  for (ExtensionSet::const_iterator cursor = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator cursor = extensions->begin();
        cursor != extensions->end();
        ++cursor) {
     const Extension* extension = cursor->get();
     if (BackgroundApplicationListModel::IsBackgroundApp(*extension,
                                                         service->profile())) {
       applications_result->push_back(extension);
     }
   }
 
   std::string locale = g_browser_process->GetApplicationLocale();
@@ skipping 316 matching lines @@
          (*old_cursor)->name() == (*new_cursor)->name() &&
          (*old_cursor)->id() == (*new_cursor)->id()) {
     ++old_cursor;
     ++new_cursor;
   }
   if (old_cursor != extensions_.end() || new_cursor != extensions.end()) {
     extensions_ = extensions;
     FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged(profile_));
   }
 }