| Index: chrome/browser/prefs/pref_functional_browsertest.cc
|
| diff --git a/chrome/browser/prefs/pref_functional_browsertest.cc b/chrome/browser/prefs/pref_functional_browsertest.cc
|
| index 9ef8ccdd0a28a6dbda834bb099914c29b57247a5..877ffe9b6afb76b7b79611b5a965d9d6217ed122 100644
|
| --- a/chrome/browser/prefs/pref_functional_browsertest.cc
|
| +++ b/chrome/browser/prefs/pref_functional_browsertest.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/browser/download/download_prefs.h"
|
| +#include "chrome/browser/net/prediction_options.h"
|
| #include "chrome/browser/prefs/pref_service_syncable.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| @@ -204,8 +205,14 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestHomepagePrefs) {
|
| IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, PRE_TestPrivacySecurityPrefs) {
|
| PrefService* prefs = browser()->profile()->GetPrefs();
|
|
|
| - EXPECT_TRUE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
|
| - prefs->SetBoolean(prefs::kNetworkPredictionEnabled, false);
|
| + static_assert(chrome_browser_net::NETWORK_PREDICTION_DEFAULT !=
|
| + chrome_browser_net::NETWORK_PREDICTION_NEVER,
|
| + "PrefsFunctionalTest.TestPrivacySecurityPrefs relies on "
|
| + "predictive network actions being enabled by default.");
|
| + EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_DEFAULT,
|
| + prefs->GetInteger(prefs::kNetworkPredictionOptions));
|
| + prefs->SetInteger(prefs::kNetworkPredictionOptions,
|
| + chrome_browser_net::NETWORK_PREDICTION_NEVER);
|
|
|
| EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
|
| prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
|
| @@ -221,7 +228,8 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, PRE_TestPrivacySecurityPrefs) {
|
| IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestPrivacySecurityPrefs) {
|
| PrefService* prefs = browser()->profile()->GetPrefs();
|
|
|
| - EXPECT_FALSE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
|
| + EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER,
|
| + prefs->GetInteger(prefs::kNetworkPredictionOptions));
|
| EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
|
| EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
|
| EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
|
|
|