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

Unified Diff: components/content_settings/core/test/content_settings_test_utils.cc

Issue 1442083002: Stop inheriting push notification permissions from regular to incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move GetContentSettingValueAndPatterns to HostContentSettingsMap, and address other review comments Created 5 years 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: components/content_settings/core/test/content_settings_test_utils.cc
diff --git a/components/content_settings/core/test/content_settings_test_utils.cc b/components/content_settings/core/test/content_settings_test_utils.cc
index 320a19eaa6dd75ed333cb66ff7ec45ed1286006a..f8dffa0209315d63c43e75116cfbf3c72c0fa060 100644
--- a/components/content_settings/core/test/content_settings_test_utils.cc
+++ b/components/content_settings/core/test/content_settings_test_utils.cc
@@ -6,6 +6,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings_types.h"
namespace content_settings {
@@ -16,9 +17,9 @@ base::Value* GetContentSettingValue(const ProviderInterface* provider,
ContentSettingsType content_type,
const std::string& resource_identifier,
bool include_incognito) {
- return GetContentSettingValueAndPatterns(provider, primary_url, secondary_url,
- content_type, resource_identifier,
- include_incognito, NULL, NULL);
+ return HostContentSettingsMap::GetContentSettingValueAndPatternsInternal(
+ provider, primary_url, secondary_url, content_type, resource_identifier,
+ include_incognito, NULL, NULL).release();
}
ContentSetting GetContentSetting(const ProviderInterface* provider,

Powered by Google App Engine
This is Rietveld 408576698