| Index: chrome/browser/sync/test/integration/sync_extension_helper.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
|
| index 2a4196c5687e88bd5a0158493875794e1ad7ff29..0c5c09b8ea8a1e6d887f0ebc5bfdf6c8dd0e8d1c 100644
|
| --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
|
| @@ -87,9 +87,9 @@ std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames(
|
| std::vector<std::string> names;
|
| ExtensionService* extension_service = profile->GetExtensionService();
|
|
|
| - scoped_ptr<const ExtensionSet> extensions(
|
| + scoped_ptr<const extensions::ExtensionSet> extensions(
|
| extension_service->GenerateInstalledExtensionsSet());
|
| - for (ExtensionSet::const_iterator it = extensions->begin();
|
| + for (extensions::ExtensionSet::const_iterator it = extensions->begin();
|
| it != extensions->end(); ++it) {
|
| names.push_back((*it)->name());
|
| }
|
| @@ -188,9 +188,9 @@ SyncExtensionHelper::ExtensionStateMap
|
|
|
| ExtensionService* extension_service = profile->GetExtensionService();
|
|
|
| - scoped_ptr<const ExtensionSet> extensions(
|
| + scoped_ptr<const extensions::ExtensionSet> extensions(
|
| extension_service->GenerateInstalledExtensionsSet());
|
| - 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();
|
| extension_state_map[id].enabled_state =
|
|
|