Update TestPrivacySecurityPrefs to new preference.

chrome/browser/prefs/pref_functional_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #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"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 178 matching lines @@
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   EXPECT_FALSE(prefs->GetBoolean(prefs::kHomePageIsNewTabPage));
   EXPECT_EQ(home_page_url.spec(), prefs->GetString(prefs::kHomePage));
 }
 
 // Verify the security preference under privacy across restarts. Part1
 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, PRE_TestPrivacySecurityPrefs) {
   PrefService* prefs = browser()->profile()->GetPrefs();
 
-  EXPECT_TRUE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
-  prefs->SetBoolean(prefs::kNetworkPredictionEnabled, false);
+  EXPECT_NE(chrome_browser_net::NETWORK_PREDICTION_DEFAULT,

[Bernhard Bauer, 2015/09/14 18:52:41]

If this fails, something is _seriously_ wrong 😉 ASSERT_NE, or better yet,
static_assert?

[Bence, 2015/09/14 21:56:57]

Done.

+            chrome_browser_net::NETWORK_PREDICTION_NEVER);
+  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);
 
   EXPECT_TRUE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
   prefs->SetBoolean(prefs::kAlternateErrorPagesEnabled, false);
 
   EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
   prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
 }
 
 // Verify the security preference under privacy across restarts. Part2
 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));
 }
 
 // Verify that we have some Local State prefs.
 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestHaveLocalStatePrefs) {
   EXPECT_TRUE(g_browser_process->local_state()->GetPreferenceValues().get());
 }