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

chrome/browser/profile_resetter/resettable_settings_snapshot.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/profile_resetter/resettable_settings_snapshot.h"
 
 #include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/feedback/feedback_data.h"
 #include "chrome/browser/feedback/feedback_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
+#include "extensions/common/extension_set.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Feedback bucket labels.
 const char kProfileResetPromptBucket[] = "SamplingOfSettingsResetPrompt";
 const char kProfileResetWebUIBucket[] = "ProfileResetReport";
 
@@ skipping 29 matching lines @@
 
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(profile);
   DCHECK(service);
   TemplateURL* dse = service->GetDefaultSearchProvider();
   if (dse)
     dse_url_ = dse->url();
 
   ExtensionService* extension_service = profile->GetExtensionService();
   DCHECK(extension_service);
-  const ExtensionSet* enabled_ext = extension_service->extensions();
+  const extensions::ExtensionSet* enabled_ext = extension_service->extensions();
   enabled_extensions_.reserve(enabled_ext->size());
 
-  for (ExtensionSet::const_iterator it = enabled_ext->begin();
+  for (extensions::ExtensionSet::const_iterator it = enabled_ext->begin();
        it != enabled_ext->end(); ++it)
     enabled_extensions_.push_back(std::make_pair((*it)->id(), (*it)->name()));
 
   // ExtensionSet is sorted but it seems to be an implementation detail.
   std::sort(enabled_extensions_.begin(), enabled_extensions_.end());
 }
 
 ResettableSettingsSnapshot::~ResettableSettingsSnapshot() {}
 
 void ResettableSettingsSnapshot::Subtract(
@@ skipping 176 matching lines @@
     (extension_names += i->second) += '\n';
   }
   if (!extension_names.empty()) {
     extension_names.erase(extension_names.end() - 1);
     AddPair(list,
             l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_EXTENSIONS),
             extension_names);
   }
   return list;
 }