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

Unified Diff: chrome/browser/devtools/devtools_sanity_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/devtools/devtools_sanity_browsertest.cc
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index c80de2c4c35757c4f05daae8bb9f51da25cf18a2..ef572d73afc915592e1db6905228c864dbb20b71 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -45,6 +45,7 @@
#include "content/public/browser/worker_service_observer.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/notification_types.h"
#include "extensions/common/switches.h"
@@ -315,7 +316,9 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
bool LoadExtensionFromPath(const base::FilePath& path) {
ExtensionService* service = extensions::ExtensionSystem::Get(
browser()->profile())->extension_service();
- size_t num_before = service->extensions()->size();
+ extensions::ExtensionRegistry* registry =
+ extensions::ExtensionRegistry::Get(browser()->profile());
+ size_t num_before = registry->enabled_extensions().size();
{
content::NotificationRegistrar registrar;
registrar.Add(this,
@@ -329,7 +332,7 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
content::RunMessageLoop();
timeout.Cancel();
}
- size_t num_after = service->extensions()->size();
+ size_t num_after = registry->enabled_extensions().size();
if (num_after != (num_before + 1))
return false;

Powered by Google App Engine
This is Rietveld 408576698