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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
index 3327752839a558c35b95a3be62cd743f2b520e39..4bfe6e2f107ffa595f0f967cfccd698b4c5c8094 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
@@ -24,6 +24,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension_set.h"
@@ -76,8 +77,10 @@ const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
Profile* profile = this->GetProfile();
ExtensionService* service =
extensions::ExtensionSystem::Get(profile)->extension_service();
+ extensions::ExtensionRegistry* registry =
+ extensions::ExtensionRegistry::Get(profile);
service->set_show_extensions_prompts(false);
- size_t num_before = service->extensions()->size();
+ size_t num_before = registry->enabled_extensions().size();
{
scoped_ptr<ExtensionInstallPrompt> install_ui;
install_ui.reset(new MockAutoConfirmExtensionInstallPrompt(
@@ -106,16 +109,15 @@ const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
observer_->Wait();
}
- size_t num_after = service->extensions()->size();
+ size_t num_after = registry->enabled_extensions().size();
if (num_before + 1 != num_after) {
VLOG(1) << "Num extensions before: " << base::IntToString(num_before)
<< " num after: " << base::IntToString(num_after)
<< " Installed extensions follow:";
- for (extensions::ExtensionSet::const_iterator it =
- service->extensions()->begin();
- it != service->extensions()->end(); ++it)
- VLOG(1) << " " << (*it)->id();
+ for (const scoped_refptr<const Extension>& extension :
+ registry->enabled_extensions())
+ VLOG(1) << " " << extension->id();
VLOG(1) << "Errors follow:";
const std::vector<base::string16>* errors =

Powered by Google App Engine
This is Rietveld 408576698