chrome/browser/ssl/ssl_browser_tests.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

Unified Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed patch conflict Created 5 years, 3 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

« no previous file with comments | « chrome/browser/ssl/chrome_ssl_host_state_delegate.cc ('k') | chrome/browser/storage/durable_storage_permission_context_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ssl/ssl_browser_tests.cc

diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc

index f9ceec92843d3fdc42fde525969770e9610ac3ce..892245163dab01a7cc11c1b7df76e724f197066b 100644

--- a/chrome/browser/ssl/ssl_browser_tests.cc

+++ b/chrome/browser/ssl/ssl_browser_tests.cc

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

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ssl/bad_clock_blocking_page.h"

@@ -1117,7 +1118,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITestWithClientCert, TestWSSClientCert) {

DCHECK(profile);

scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());

dict->SetString("ISSUER.CN", "pywebsocket");

- profile->GetHostContentSettingsMap()->SetWebsiteSetting(

+ HostContentSettingsMapFactory::GetForProfile(profile)->SetWebsiteSetting(

ContentSettingsPattern::FromURL(url),

CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,

@@ -2251,8 +2252,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITestIgnoreCertErrors, TestWSS) {

TestInterstitialJavaScriptProceeds

#endif

IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestInterstitialJavaScriptProceeds) {

- browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(

- CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);

+ HostContentSettingsMapFactory::GetForProfile(browser()->profile())

+ ->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT,

+ CONTENT_SETTING_BLOCK);

ASSERT_TRUE(https_server_expired_.Start());

WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();

@@ -2285,8 +2287,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestInterstitialJavaScriptProceeds) {

// Verifies that the interstitial can go back, even if JavaScript is disabled.

// http://crbug.com/322948

IN_PROC_BROWSER_TEST_F(SSLUITest, TestInterstitialJavaScriptGoesBack) {