summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 16:26:16 +0000
committerskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 16:26:16 +0000
commit9c7ec6dd24d8774cc88232354cd15f31ed28d61d (patch)
tree8e28bfaca45d97e27684f2f35c644ea8ca1ee696 /chrome/test
parentd509ba755674f0b9dd1037ea25404378fab38e87 (diff)
downloadchromium_src-9c7ec6dd24d8774cc88232354cd15f31ed28d61d.zip
chromium_src-9c7ec6dd24d8774cc88232354cd15f31ed28d61d.tar.gz
chromium_src-9c7ec6dd24d8774cc88232354cd15f31ed28d61d.tar.bz2
Revert 79407 - Move ExtensionService code that manages pending extensions into its own class.
This change should have no impact on chrome's behavior. Once all code paths that install an extension inform PendingExtensionManger that they are starting an install, we can correctly merge requests to install the same extension from multiple sources. This will remove two hacky checks to avoid install races we have seen on Chrome Os. It will also ensure that more hacks are not needed. BUG=61000 TEST=ExtensionUpdaterTest.*:ExtensionServiceTest.*' Review URL: http://codereview.chromium.org/6670055 TBR=skerner@chromium.org Review URL: http://codereview.chromium.org/6730058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/live_sync/live_extensions_sync_test.cc9
-rw-r--r--chrome/test/live_sync/live_extensions_sync_test_base.cc9
-rw-r--r--chrome/test/live_sync/live_themes_sync_test.cc6
3 files changed, 11 insertions, 13 deletions
diff --git a/chrome/test/live_sync/live_extensions_sync_test.cc b/chrome/test/live_sync/live_extensions_sync_test.cc
index ab3b692..9b2e64a 100644
--- a/chrome/test/live_sync/live_extensions_sync_test.cc
+++ b/chrome/test/live_sync/live_extensions_sync_test.cc
@@ -54,11 +54,10 @@ ExtensionStateMap GetExtensionStates(ExtensionService* extensions_service) {
extension_states[(*it)->id()] = DISABLED;
}
- const PendingExtensionManager* pending_extension_manager =
- extensions_service->pending_extension_manager();
- PendingExtensionManager::const_iterator it;
- for (it = pending_extension_manager->begin();
- it != pending_extension_manager->end(); ++it) {
+ const PendingExtensionMap& pending_extensions =
+ extensions_service->pending_extensions();
+ for (PendingExtensionMap::const_iterator it = pending_extensions.begin();
+ it != pending_extensions.end(); ++it) {
extension_states[it->first] = PENDING;
}
diff --git a/chrome/test/live_sync/live_extensions_sync_test_base.cc b/chrome/test/live_sync/live_extensions_sync_test_base.cc
index ced3663..97e245a 100644
--- a/chrome/test/live_sync/live_extensions_sync_test_base.cc
+++ b/chrome/test/live_sync/live_extensions_sync_test_base.cc
@@ -114,11 +114,10 @@ void LiveExtensionsSyncTestBase::InstallAllPendingExtensions(
// We make a copy here since InstallExtension() removes the
// extension from the extensions service's copy.
- const PendingExtensionManager* pending_extension_manager =
- profile->GetExtensionService()->pending_extension_manager();
- PendingExtensionManager::const_iterator it;
- for (it = pending_extension_manager->begin();
- it != pending_extension_manager->end(); ++it) {
+ PendingExtensionMap pending_extensions =
+ profile->GetExtensionService()->pending_extensions();
+ for (PendingExtensionMap::const_iterator it = pending_extensions.begin();
+ it != pending_extensions.end(); ++it) {
ExtensionIdMap::const_iterator it2 = extensions_by_id_.find(it->first);
CHECK(it2 != extensions_by_id_.end());
InstallExtension(profile, it2->second);
diff --git a/chrome/test/live_sync/live_themes_sync_test.cc b/chrome/test/live_sync/live_themes_sync_test.cc
index 14994a3..0537565 100644
--- a/chrome/test/live_sync/live_themes_sync_test.cc
+++ b/chrome/test/live_sync/live_themes_sync_test.cc
@@ -59,9 +59,9 @@ bool LiveThemesSyncTest::UsingNativeTheme(Profile* profile) {
bool LiveThemesSyncTest::ExtensionIsPendingInstall(
Profile* profile, const Extension* extension) {
- const PendingExtensionManager* pending_extension_manager =
- profile->GetExtensionService()->pending_extension_manager();
- return pending_extension_manager->IsIdPending(extension->id());
+ const PendingExtensionMap& pending_extensions =
+ profile->GetExtensionService()->pending_extensions();
+ return pending_extensions.find(extension->id()) != pending_extensions.end();
}
bool LiveThemesSyncTest::HasOrWillHaveCustomTheme(