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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

Issue 2418813002: [Reland] Refactoring of SBER preference usage (Closed)
Patch Set: Fix static init in preference_api Created 4 years, 2 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
« chrome/browser/extensions/api/preference/preference_api.cc ('K') | « chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
index 55f64fec0c9f7fda34db86f7386b77cccd51addf..b8a6eaaa71ebcdb81ada1b2e95a4bcf242754fed 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
@@ -11,9 +11,9 @@
#include "chrome/browser/safe_browsing/test_safe_browsing_service.h"
#include "chrome/browser/safe_browsing/threat_details.h"
#include "chrome/browser/safe_browsing/ui_manager.h"
-#include "chrome/common/pref_names.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "components/prefs/pref_service.h"
+#include "components/safe_browsing_db/safe_browsing_prefs.h"
#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_process_host.h"
@@ -235,8 +235,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwarePageDontProceed) {
// Enable malware details.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Start a load.
controller().LoadURL(GURL(kBadURL), content::Referrer(),
@@ -270,8 +269,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwarePageProceed) {
// Enable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Start a load.
controller().LoadURL(GURL(kBadURL), content::Referrer(),
@@ -304,8 +302,7 @@ TEST_F(SafeBrowsingBlockingPageTest, PageWithMalwareResourceDontProceed) {
// Enable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Navigate somewhere.
Navigate(kGoogleURL, 1, 0, true);
@@ -340,8 +337,7 @@ TEST_F(SafeBrowsingBlockingPageTest, PageWithMalwareResourceProceed) {
// Enable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Navigate somewhere.
Navigate(kGoodURL, 1, 0, true);
@@ -374,8 +370,7 @@ TEST_F(SafeBrowsingBlockingPageTest,
// Enable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Navigate somewhere.
Navigate(kGoogleURL, 1, 0, true);
@@ -416,8 +411,7 @@ TEST_F(SafeBrowsingBlockingPageTest,
// Enable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Navigate somewhere.
Navigate(kGoogleURL, 1, 0, true);
@@ -473,8 +467,7 @@ TEST_F(SafeBrowsingBlockingPageTest, PageWithMultipleMalwareResourceProceed) {
// Enable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Navigate somewhere else.
Navigate(kGoodURL, 1, 0, true);
@@ -525,8 +518,7 @@ TEST_F(SafeBrowsingBlockingPageTest, NavigatingBackAndForth) {
// Enable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Navigate somewhere.
Navigate(kGoodURL, 1, 0, true);
@@ -577,8 +569,7 @@ TEST_F(SafeBrowsingBlockingPageTest, ProceedThenDontProceed) {
// Enable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Start a load.
controller().LoadURL(GURL(kBadURL), content::Referrer(),
@@ -613,8 +604,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsDisabled) {
// Disable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, false);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), false);
// Start a load.
controller().LoadURL(GURL(kBadURL), content::Referrer(),
@@ -648,8 +638,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsToggling) {
// Disable malware reports.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, false);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), false);
// Start a load.
controller().LoadURL(GURL(kBadURL), content::Referrer(),
@@ -663,20 +652,17 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsToggling) {
base::RunLoop().RunUntilIdle();
- EXPECT_FALSE(profile->GetPrefs()->GetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled));
+ EXPECT_FALSE(IsExtendedReportingEnabled(*profile->GetPrefs()));
// Simulate the user check the report agreement checkbox.
sb_interstitial->controller()->SetReportingPreference(true);
- EXPECT_TRUE(profile->GetPrefs()->GetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled));
+ EXPECT_TRUE(IsExtendedReportingEnabled(*profile->GetPrefs()));
// Simulate the user uncheck the report agreement checkbox.
sb_interstitial->controller()->SetReportingPreference(false);
- EXPECT_FALSE(profile->GetPrefs()->GetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled));
+ EXPECT_FALSE(IsExtendedReportingEnabled(*profile->GetPrefs()));
}
// Test that extended reporting option is not shown on blocking an HTTPS main
@@ -685,8 +671,7 @@ TEST_F(SafeBrowsingBlockingPageTest, ExtendedReportingNotShownOnSecurePage) {
// Enable malware details.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Start a load.
controller().LoadURL(GURL(kBadHTTPSURL), content::Referrer(),
@@ -719,8 +704,7 @@ TEST_F(SafeBrowsingBlockingPageTest,
// Enable malware details.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Commit a load.
content::WebContentsTester::For(web_contents())
@@ -754,8 +738,7 @@ TEST_F(SafeBrowsingBlockingPageTest,
// Enable malware details.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Commit a load.
content::WebContentsTester::For(web_contents())
@@ -789,8 +772,7 @@ TEST_F(SafeBrowsingBlockingPageTest,
// Enable malware details.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Commit a load.
content::WebContentsTester::For(web_contents())
@@ -825,8 +807,7 @@ TEST_F(SafeBrowsingBlockingPageTest,
// Enable malware details.
Profile* profile = Profile::FromBrowserContext(
web_contents()->GetBrowserContext());
- profile->GetPrefs()->SetBoolean(
- prefs::kSafeBrowsingExtendedReportingEnabled, true);
+ profile->GetPrefs()->SetBoolean(GetExtendedReportingPrefName(), true);
// Commit a load.
content::WebContentsTester::For(web_contents())
« chrome/browser/extensions/api/preference/preference_api.cc ('K') | « chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698