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

chrome/browser/ui/app_list/search/app_search_provider.cc

 // Copyright 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/ui/app_list/search/app_search_provider.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/search/app_result.h"
 #include "chrome/browser/ui/app_list/search/tokenized_string.h"
 #include "chrome/browser/ui/app_list/search/tokenized_string_match.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 
 namespace app_list {
 
 class AppSearchProvider::App {
  public:
   explicit App(const extensions::Extension* extension)
       : app_id_(extension->id()),
         indexed_name_(UTF8ToUTF16(extension->name())) {
   }
   ~App() {}
@@ skipping 36 matching lines @@
 
     scoped_ptr<AppResult> result(
         new AppResult(profile_, (*app_it)->app_id(), list_controller_));
     result->UpdateFromMatch((*app_it)->indexed_name(), match);
     Add(result.PassAs<ChromeSearchResult>());
   }
 }
 
 void AppSearchProvider::Stop() {}
 
-void AppSearchProvider::AddApps(const ExtensionSet* extensions,
+void AppSearchProvider::AddApps(const extensions::ExtensionSet* extensions,
                                 ExtensionService* service) {
-  for (ExtensionSet::const_iterator iter = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator iter = extensions->begin();
        iter != extensions->end(); ++iter) {
     const extensions::Extension* app = iter->get();
 
     if (!app->ShouldDisplayInAppLauncher())
       continue;
 
     if (profile_->IsOffTheRecord() &&
         !extension_util::CanLoadInIncognito(app, service))
       continue;
     apps_.push_back(new App(app));
@@ skipping 14 matching lines @@
   AddApps(extension_service->terminated_extensions(), extension_service);
 }
 
 void AppSearchProvider::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& detaila) {
   RefreshApps();
 }
 
 }  // namespace app_list