Remove NetPrefObserver class and two prefs that do not do anything.

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 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 "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/geolocation/geolocation_prefs.h"
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_device_id_salt.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/net/http_server_properties_manager_factory.h"
-#include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/notifications/extension_welcome_notification.h"
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/origin_trial_prefs.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
@@ skipping 243 matching lines @@
     "googlegeolocationaccess.enabled";
 #endif
 
 // Deprecated 4/2016.
 const char kCheckDefaultBrowser[] = "browser.check_default_browser";
 
 // Deprecated 5/2016.
 const char kDesktopSearchRedirectionInfobarShownPref[] =
     "desktop_search_redirection_infobar_shown";
 
+// Deprecated 7/2016.
+const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled";
+const char kDisableSpdy[] = "spdy.disabled";
+
 void DeleteWebRTCIdentityStoreDBOnFileThread(base::FilePath profile_path) {
   base::DeleteFile(profile_path.Append(
       FILE_PATH_LITERAL("WebRTCIdentityStore")), false);
   base::DeleteFile(profile_path.Append(
       FILE_PATH_LITERAL("WebRTCIdentityStore-journal")), false);
 }
 
 void DeleteWebRTCIdentityStoreDB(Profile* profile) {
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::FILE,
@@ skipping 142 matching lines @@
   chrome_prefs::RegisterProfilePrefs(registry);
   dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry);
   DownloadPrefs::RegisterProfilePrefs(registry);
   HostContentSettingsMap::RegisterProfilePrefs(registry);
   IncognitoModePrefs::RegisterProfilePrefs(registry);
   InstantUI::RegisterProfilePrefs(registry);
   NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
   MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
   MediaDeviceIDSalt::RegisterProfilePrefs(registry);
   MediaStreamDevicesController::RegisterProfilePrefs(registry);
-  NetPrefObserver::RegisterProfilePrefs(registry);
   ntp_snippets::NTPSnippetsService::RegisterProfilePrefs(registry);
   password_bubble_experiment::RegisterPrefs(registry);
   password_manager::PasswordManager::RegisterProfilePrefs(registry);
   PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
   PrefsTabHelper::RegisterProfilePrefs(registry);
   Profile::RegisterProfilePrefs(registry);
   ProfileImpl::RegisterProfilePrefs(registry);
   ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
   PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
   RegisterBrowserUserPrefs(registry);
@@ skipping 152 matching lines @@
   registry->RegisterBooleanPref(kRestoreOnStartupMigrated, false);
 
 #if BUILDFLAG(ENABLE_GOOGLE_NOW)
   registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false);
 #endif
 
   registry->RegisterBooleanPref(kCheckDefaultBrowser, true);
 
   registry->RegisterBooleanPref(kDesktopSearchRedirectionInfobarShownPref,
                                 false);
+
+  registry->RegisterBooleanPref(kNetworkPredictionEnabled, true);
+  registry->RegisterBooleanPref(kDisableSpdy, false);
 }
 
 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 
 #if defined(OS_CHROMEOS)
   chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
 #endif
 }
 
@@ skipping 78 matching lines @@
     profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined,
                             install_time.ToInternalValue());
   }
   profile_prefs->ClearPref(kCheckDefaultBrowser);
 
   // Added 5/2016.
   profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
 
   // Added 7/2016.
   DeleteWebRTCIdentityStoreDB(profile);
+  profile_prefs->ClearPref(kNetworkPredictionEnabled);
+  profile_prefs->ClearPref(kDisableSpdy);
 }
 
 }  // namespace chrome