chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc - Issue 709813004: Remove the deprecated function ExtensionService::extensions().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« chrome/browser/chromeos/login/help_app_launcher.cc ('K') | « chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc ('k') | chrome/browser/extensions/api/messaging/message_service.cc » ('j') | chrome/browser/extensions/api/messaging/message_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

index cf5c23d0c27b187370f08bcb7373bf976f5e839f..bb47bd6fe43c1cbe0a2bc9da106e9b7d108fb7ca 100644

--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

+++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

@@ -8,7 +8,6 @@

#include "base/strings/stringprintf.h"

#include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"

#include "chrome/browser/extensions/extension_apitest.h"

-#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/net/nss_context.h"

#include "chrome/browser/net/url_request_mock_util.h"

#include "chromeos/chromeos_switches.h"

@@ -21,6 +20,7 @@

#include "content/public/test/test_utils.h"

#include "crypto/nss_util_internal.h"

#include "crypto/scoped_test_system_nss_key_slot.h"

+#include "extensions/browser/extension_registry.h"

#include "extensions/browser/notification_types.h"

#include "net/base/net_errors.h"

#include "net/cert/nss_cert_database.h"

@@ -373,10 +373,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,

base::FilePath extension_path =

test_data_dir_.AppendASCII("enterprise_platform_keys");

- ExtensionService* service =

- extensions::ExtensionSystem::Get(profile())->extension_service();

+ extensions::ExtensionRegistry* registry =

+ extensions::ExtensionRegistry::Get(profile());

const extensions::Extension* extension =

- GetExtensionByPath(service->extensions(), extension_path);

+ GetExtensionByPath(registry->enabled_extensions(), extension_path);

ASSERT_FALSE(extension->install_warnings().empty());

EXPECT_EQ(

"'enterprise.platformKeys' is not allowed for specified install "