Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: chrome/test/live_sync/live_extensions_sync_test_base.cc

Issue 5000002: [Sync] Fix modification-while-iterating bug in extensions integration tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/live_sync/live_extensions_sync_test_base.h" 5 #include "chrome/test/live_sync/live_extensions_sync_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 CHECK(profile); 104 CHECK(profile);
105 CHECK(extension.get()); 105 CHECK(extension.get());
106 profile->GetExtensionsService()->OnExtensionInstalled(extension, true); 106 profile->GetExtensionsService()->OnExtensionInstalled(extension, true);
107 } 107 }
108 108
109 void LiveExtensionsSyncTestBase::InstallAllPendingExtensions( 109 void LiveExtensionsSyncTestBase::InstallAllPendingExtensions(
110 Profile* profile) { 110 Profile* profile) {
111 // TODO(akalin): Mock out the servers that the extensions 111 // TODO(akalin): Mock out the servers that the extensions
112 // auto-update mechanism talk to so as to more closely match what 112 // auto-update mechanism talk to so as to more closely match what
113 // actually happens. 113 // actually happens.
114 const PendingExtensionMap& pending_extensions = 114
115 // We make a copy here since InstallExtension() removes the
116 // extension from the extensions service's copy.
117 PendingExtensionMap pending_extensions =
115 profile->GetExtensionsService()->pending_extensions(); 118 profile->GetExtensionsService()->pending_extensions();
116 for (PendingExtensionMap::const_iterator it = pending_extensions.begin(); 119 for (PendingExtensionMap::const_iterator it = pending_extensions.begin();
117 it != pending_extensions.end(); ++it) { 120 it != pending_extensions.end(); ++it) {
118 ExtensionIdMap::const_iterator it2 = extensions_by_id_.find(it->first); 121 ExtensionIdMap::const_iterator it2 = extensions_by_id_.find(it->first);
119 CHECK(it2 != extensions_by_id_.end()); 122 CHECK(it2 != extensions_by_id_.end());
120 InstallExtension(profile, it2->second); 123 InstallExtension(profile, it2->second);
121 } 124 }
122 } 125 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698