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

Unified Diff: chrome/browser/extensions/browser_action_apitest.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional cleanup Created 6 years, 10 months 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/extensions/browser_action_apitest.cc
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index 930162d77a6c55f45fd7bf77e94f09b150dd5138..2387b96f91845301e662bdedb284c35af9f71a05 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -4,20 +4,20 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_registry.h"
// Tests that tooltips of a browser action icon can be specified using UTF8.
// See http://crbug.com/25349.
IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) {
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
- const size_t size_before = service->extensions()->size();
+ extension::ExtensionRegistry* registry =
+ extensions::ExtensionRegistry::Get(browser()->profile());
+ const size_t size_before = registry->enabled_extensions().size();
base::FilePath extension_path(test_data_dir_.AppendASCII("browsertest")
.AppendASCII("title_localized"));
const Extension* extension = LoadExtension(extension_path);
ASSERT_TRUE(extension);
- ASSERT_EQ(size_before + 1, service->extensions()->size());
+ ASSERT_EQ(size_before + 1, registry->enabled_extensions().size());
EXPECT_STREQ(base::WideToUTF8(
L"Hreggvi\u00F0ur: l10n browser action").c_str(),

Powered by Google App Engine
This is Rietveld 408576698