| 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 41db6640038e666a9c2550ab69f2f0109ebadcd0..bf2583e6ceb41ae07692d06649991acc1a088c00 100644
|
| --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
|
| @@ -148,23 +148,23 @@ void SyncExtensionHelper::InstallExtensionsPendingForSync(
|
| const PendingExtensionManager* pending_extension_manager =
|
| profile->GetExtensionService()->pending_extension_manager();
|
|
|
| - std::set<std::string> pending_crx_ids;
|
| + std::list<std::string> pending_crx_ids;
|
| pending_extension_manager->GetPendingIdsForUpdateCheck(&pending_crx_ids);
|
|
|
| - std::set<std::string>::const_iterator id;
|
| + std::list<std::string>::const_iterator iter;
|
| PendingExtensionInfo info;
|
| - for (id = pending_crx_ids.begin(); id != pending_crx_ids.end(); ++id) {
|
| - ASSERT_TRUE(pending_extension_manager->GetById(*id, &info));
|
| + for (iter = pending_crx_ids.begin(); iter != pending_crx_ids.end(); ++iter) {
|
| + ASSERT_TRUE(pending_extension_manager->GetById(*iter, &info));
|
| if (!info.is_from_sync())
|
| continue;
|
|
|
| - StringMap::const_iterator it2 = id_to_name_.find(*id);
|
| - if (it2 == id_to_name_.end()) {
|
| - ADD_FAILURE() << "Could not get name for id " << *id
|
| + StringMap::const_iterator iter2 = id_to_name_.find(*iter);
|
| + if (iter2 == id_to_name_.end()) {
|
| + ADD_FAILURE() << "Could not get name for id " << *iter
|
| << " (profile = " << profile->GetDebugName() << ")";
|
| continue;
|
| }
|
| - InstallExtension(profile, it2->second, type);
|
| + InstallExtension(profile, iter2->second, type);
|
| }
|
| }
|
|
|
|
|