| Index: chrome/browser/extensions/all_urls_apitest.cc
|
| diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
|
| index 6422c645e66968a56679c8771c9220ec16d23bd6..b251d72ee748f55dc2ed03b525b3a14e9d131ec8 100644
|
| --- a/chrome/browser/extensions/all_urls_apitest.cc
|
| +++ b/chrome/browser/extensions/all_urls_apitest.cc
|
| @@ -4,13 +4,12 @@
|
|
|
| #include "base/command_line.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| -#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/test/base/test_switches.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "components/crx_file/id_util.h"
|
| -#include "extensions/browser/extension_system.h"
|
| +#include "extensions/browser/extension_registry.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extensions_client.h"
|
| #include "extensions/test/extension_test_message_listener.h"
|
| @@ -46,12 +45,12 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) {
|
| extensions::ExtensionsClient::Get()->SetScriptingWhitelist(whitelist);
|
|
|
| // Then load extensions.
|
| - ExtensionService* service = extensions::ExtensionSystem::Get(
|
| - browser()->profile())->extension_service();
|
| - const size_t size_before = service->extensions()->size();
|
| + extensions::ExtensionRegistry* registry =
|
| + extensions::ExtensionRegistry::Get(browser()->profile());
|
| + const size_t size_before = registry->enabled_extensions().size();
|
| ASSERT_TRUE(LoadExtension(extension_dir1));
|
| ASSERT_TRUE(LoadExtension(extension_dir2));
|
| - EXPECT_EQ(size_before + 2, service->extensions()->size());
|
| + EXPECT_EQ(size_before + 2, registry->enabled_extensions().size());
|
|
|
| std::string url;
|
|
|
| @@ -107,12 +106,12 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, RegularExtensions) {
|
| base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls")
|
| .AppendASCII("execute_script");
|
|
|
| - ExtensionService* service = extensions::ExtensionSystem::Get(
|
| - browser()->profile())->extension_service();
|
| - const size_t size_before = service->extensions()->size();
|
| + extensions::ExtensionRegistry* registry =
|
| + extensions::ExtensionRegistry::Get(browser()->profile());
|
| + const size_t size_before = registry->enabled_extensions().size();
|
| ASSERT_TRUE(LoadExtension(extension_dir1));
|
| ASSERT_TRUE(LoadExtension(extension_dir2));
|
| - EXPECT_EQ(size_before + 2, service->extensions()->size());
|
| + EXPECT_EQ(size_before + 2, registry->enabled_extensions().size());
|
|
|
| // Now verify we can script a regular http page.
|
| ASSERT_TRUE(StartEmbeddedTestServer());
|
|
|