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

chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 60 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/process_type.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/view_type.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using content::DomOperationNotificationDetails;
 using content::DownloadItem;
 using content::DownloadManager;
@@ skipping 1650 matching lines @@
     content::DownloadManager* manager) {
   delete this;
 }
 
 namespace {
 
 // Returns a vector of dictionaries containing information about installed apps,
 // as identified from a given list of extensions.  The caller takes ownership
 // of the created vector.
 std::vector<DictionaryValue*>* GetAppInfoFromExtensions(
-    const ExtensionSet* extensions,
+    const extensions::ExtensionSet* extensions,
     ExtensionService* ext_service) {
   std::vector<DictionaryValue*>* apps_list =
       new std::vector<DictionaryValue*>();
-  for (ExtensionSet::const_iterator ext = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator ext = extensions->begin();
        ext != extensions->end(); ++ext) {
     // Only return information about extensions that are actually apps.
     if ((*ext)->is_app()) {
       DictionaryValue* app_info = new DictionaryValue();
       AppLauncherHandler::CreateAppInfo(ext->get(), ext_service, app_info);
       app_info->SetBoolean(
           "is_component_extension",
           (*ext)->location() == extensions::Manifest::COMPONENT);
 
       // Convert the launch_type integer into a more descriptive string.
@@ skipping 46 matching lines @@
   // Collect information about the apps in the new tab page.
   ExtensionService* ext_service = extensions::ExtensionSystem::Get(
       automation_->profile())->extension_service();
   if (!ext_service) {
     AutomationJSONReply(automation_.get(), reply_message_.release())
         .SendError("No ExtensionService.");
     return;
   }
   // Process enabled extensions.
   ListValue* apps_list = new ListValue();
-  const ExtensionSet* extensions = ext_service->extensions();
+  const extensions::ExtensionSet* extensions = ext_service->extensions();
   std::vector<DictionaryValue*>* enabled_apps = GetAppInfoFromExtensions(
       extensions, ext_service);
   for (std::vector<DictionaryValue*>::const_iterator app =
        enabled_apps->begin(); app != enabled_apps->end(); ++app) {
     (*app)->SetBoolean("is_disabled", false);
     apps_list->Append(*app);
   }
   delete enabled_apps;
   // Process disabled extensions.
-  const ExtensionSet* disabled_extensions = ext_service->disabled_extensions();
+  const extensions::ExtensionSet* disabled_extensions =
+      ext_service->disabled_extensions();
   std::vector<DictionaryValue*>* disabled_apps = GetAppInfoFromExtensions(
       disabled_extensions, ext_service);
   for (std::vector<DictionaryValue*>::const_iterator app =
        disabled_apps->begin(); app != disabled_apps->end(); ++app) {
     (*app)->SetBoolean("is_disabled", true);
     apps_list->Append(*app);
   }
   delete disabled_apps;
   // Process terminated extensions.
-  const ExtensionSet* terminated_extensions =
+  const extensions::ExtensionSet* terminated_extensions =
       ext_service->terminated_extensions();
   std::vector<DictionaryValue*>* terminated_apps = GetAppInfoFromExtensions(
       terminated_extensions, ext_service);
   for (std::vector<DictionaryValue*>::const_iterator app =
        terminated_apps->begin(); app != terminated_apps->end(); ++app) {
     (*app)->SetBoolean("is_disabled", true);
     apps_list->Append(*app);
   }
   delete terminated_apps;
   ntp_info_->Set("apps", apps_list);
@@ skipping 792 matching lines @@
       if (automation_.get()) {
         AutomationJSONReply(automation_.get(), reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }