diff options
Diffstat (limited to 'chromium/chrome/browser/extensions/api/content_settings')
3 files changed, 31 insertions, 12 deletions
diff --git a/chromium/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chromium/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index ede8794e010..a2fabc3ef4e 100644 --- a/chromium/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chromium/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc @@ -400,17 +400,38 @@ IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, "ContentSettings.ExtensionNonEmbeddedSettingSet", 2); } -IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, EmbeddedSettings) { - base::test::ScopedFeatureList scoped_feature_list; - scoped_feature_list.InitAndDisableFeature(features::kPermissionDelegation); +class ExtensionContentSettingsApiTestWithPermissionDelegationDisabled + : public ExtensionContentSettingsApiTest { + public: + ExtensionContentSettingsApiTestWithPermissionDelegationDisabled() { + feature_list_.InitAndDisableFeature(features::kPermissionDelegation); + } + + private: + base::test::ScopedFeatureList feature_list_; +}; + +class ExtensionContentSettingsApiTestWithPermissionDelegationEnabled + : public ExtensionContentSettingsApiTest { + public: + ExtensionContentSettingsApiTestWithPermissionDelegationEnabled() { + feature_list_.InitAndEnableFeature(features::kPermissionDelegation); + } + + private: + base::test::ScopedFeatureList feature_list_; +}; + +IN_PROC_BROWSER_TEST_F( + ExtensionContentSettingsApiTestWithPermissionDelegationDisabled, + EmbeddedSettings) { const char kExtensionPath[] = "content_settings/embeddedsettings"; EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, - EmbeddedSettingsPermissionDelegation) { - base::test::ScopedFeatureList scoped_feature_list; - scoped_feature_list.InitAndEnableFeature(features::kPermissionDelegation); +IN_PROC_BROWSER_TEST_F( + ExtensionContentSettingsApiTestWithPermissionDelegationEnabled, + EmbeddedSettings) { const char kExtensionPath[] = "content_settings/embeddedsettings"; EXPECT_TRUE( RunExtensionSubtest(kExtensionPath, "test.html?permission_delegation")) diff --git a/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.cc b/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.cc index 47757999355..5ef415d0622 100644 --- a/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.cc +++ b/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.cc @@ -6,15 +6,13 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_refptr.h" -#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_prefs_scope.h" #include "extensions/browser/pref_names.h" namespace extensions { ContentSettingsService::ContentSettingsService(content::BrowserContext* context) - : content_settings_store_(base::MakeRefCounted<ContentSettingsStore>()), - scoped_observer_(this) {} + : content_settings_store_(base::MakeRefCounted<ContentSettingsStore>()) {} ContentSettingsService::~ContentSettingsService() {} diff --git a/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h b/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h index 4887f5ee2cd..c5a86f87f42 100644 --- a/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h +++ b/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h @@ -10,12 +10,12 @@ #include "base/scoped_observer.h" #include "chrome/browser/extensions/api/content_settings/content_settings_store.h" #include "extensions/browser/browser_context_keyed_api_factory.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_prefs_observer.h" namespace extensions { class ContentSettingsStore; -class ExtensionPrefs; // This service hosts a single ContentSettingsStore for the // chrome.contentSettings API. @@ -59,7 +59,7 @@ class ContentSettingsService : public BrowserContextKeyedAPI, static const char* service_name() { return "ContentSettingsService"; } scoped_refptr<ContentSettingsStore> content_settings_store_; - ScopedObserver<ExtensionPrefs, ExtensionPrefsObserver> scoped_observer_; + ScopedObserver<ExtensionPrefs, ExtensionPrefsObserver> scoped_observer_{this}; DISALLOW_COPY_AND_ASSIGN(ContentSettingsService); }; |