Revert of Update extension preference API.

chrome/browser/extensions/api/preference/preference_apitest.cc

Index: chrome/browser/extensions/api/preference/preference_apitest.cc
diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc
index 9f062882e6846b70e530bf069cd04fe84d408148..4f58d936fd18caf44fa78c7f92bd2021abcca262 100644
--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -7,7 +7,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
@@ -44,8 +43,7 @@
     EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableHyperlinkAuditing));
     EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableReferrers));
     EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableTranslate));
-    EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_DEFAULT,
-              prefs->GetInteger(prefs::kNetworkPredictionOptions));
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
     EXPECT_TRUE(prefs->GetBoolean(
         password_manager::prefs::kPasswordManagerSavingEnabled));
     EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
@@ -64,8 +62,7 @@
     EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableHyperlinkAuditing));
     EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableReferrers));
     EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableTranslate));
-    EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER,
-              prefs->GetInteger(prefs::kNetworkPredictionOptions));
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
     EXPECT_FALSE(prefs->GetBoolean(
         password_manager::prefs::kPasswordManagerSavingEnabled));
     EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
@@ -112,8 +109,7 @@
   prefs->SetBoolean(prefs::kEnableHyperlinkAuditing, false);
   prefs->SetBoolean(prefs::kEnableReferrers, false);
   prefs->SetBoolean(prefs::kEnableTranslate, false);
-  prefs->SetInteger(prefs::kNetworkPredictionOptions,
-                    chrome_browser_net::NETWORK_PREDICTION_NEVER);
+  prefs->SetBoolean(prefs::kNetworkPredictionEnabled, false);
   prefs->SetBoolean(password_manager::prefs::kPasswordManagerSavingEnabled,
                     false);
   prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);