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

apps/app_restore_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 "apps/app_restore_service.h"
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/app_restore_service_factory.h"
 #include "apps/launcher.h"
 #include "apps/saved_files_service.h"
 #include "apps/shell_window.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif
 
 using extensions::Extension;
 using extensions::ExtensionHost;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionSystem;
 
@@ skipping 14 matching lines @@
 }
 
 AppRestoreService::AppRestoreService(Profile* profile)
     : profile_(profile) {
   StartObservingAppLifetime();
 }
 
 void AppRestoreService::HandleStartup(bool should_restore_apps) {
   ExtensionService* extension_service =
       ExtensionSystem::Get(profile_)->extension_service();
-  const ExtensionSet* extensions = extension_service->extensions();
+  const extensions::ExtensionSet* extensions = extension_service->extensions();
   ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
 
-  for (ExtensionSet::const_iterator it = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator it = extensions->begin();
       it != extensions->end(); ++it) {
     const Extension* extension = it->get();
     if (extension_prefs->IsExtensionRunning(extension->id())) {
       RecordAppStop(extension->id());
       // If we are not restoring apps (e.g., because it is a clean restart), and
       // the app does not have retain permission, explicitly clear the retained
       // entries queue.
       if (should_restore_apps) {
         RestoreApp(it->get());
       } else {
@@ skipping 82 matching lines @@
 
 void AppRestoreService::StopObservingAppLifetime() {
   AppLifetimeMonitor* app_lifetime_monitor =
       AppLifetimeMonitorFactory::GetForProfile(profile_);
   // This might be NULL in tests.
   if (app_lifetime_monitor)
     app_lifetime_monitor->RemoveObserver(this);
 }
 
 }  // namespace apps