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

chrome/browser/sync/test/integration/extension_settings_helper.cc

Index: chrome/browser/sync/test/integration/extension_settings_helper.cc
diff --git a/chrome/browser/sync/test/integration/extension_settings_helper.cc b/chrome/browser/sync/test/integration/extension_settings_helper.cc
index acfb2fceae2d2ba8361a3f01b615b2bf8e6e81b4..b51d59059bbcfb63c18b073b117df7a76588131e 100644
--- a/chrome/browser/sync/test/integration/extension_settings_helper.cc
+++ b/chrome/browser/sync/test/integration/extension_settings_helper.cc
@@ -17,9 +17,9 @@
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
 #include "chrome/browser/value_store/value_store.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 
 using content::BrowserThread;
 using sync_datatype_helper::test;
@@ -57,7 +57,7 @@ scoped_ptr<DictionaryValue> GetAllSettings(
 }
 
 bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) {
-  const ExtensionSet* extensions =
+  const extensions::ExtensionSet* extensions =
       expected_profile->GetExtensionService()->extensions();
   if (extensions->size() !=
       actual_profile->GetExtensionService()->extensions()->size()) {
@@ -66,7 +66,7 @@ bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) {
   }
 
   bool same = true;
-  for (ExtensionSet::const_iterator it = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator it = extensions->begin();
       it != extensions->end(); ++it) {
     const std::string& id = (*it)->id();
     scoped_ptr<DictionaryValue> expected(GetAllSettings(expected_profile, id));