Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/intranet_redirect_detector.cc

 // Copyright (c) 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/intranet_redirect_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
@@ skipping 25 matching lines @@
 }
 
 // static
 GURL IntranetRedirectDetector::RedirectOrigin() {
   const IntranetRedirectDetector* const detector =
       g_browser_process->intranet_redirect_detector();
   return detector ? detector->redirect_origin_ : GURL();
 }
 
 // static
-void IntranetRedirectDetector::RegisterPrefs(PrefServiceSimple* prefs) {
-  prefs->RegisterStringPref(prefs::kLastKnownIntranetRedirectOrigin,
-                            std::string());
+void IntranetRedirectDetector::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterStringPref(prefs::kLastKnownIntranetRedirectOrigin,
+                               std::string());
 }
 
 void IntranetRedirectDetector::FinishSleep() {
   in_sleep_ = false;
 
   // If another fetch operation is still running, cancel it.
   STLDeleteElements(&fetchers_);
   resulting_origins_.clear();
 
   // The detector is not needed in Chrome Frame since we have no omnibox there.
@@ skipping 102 matching lines @@
   // the same thread.  So just use the heuristic that any all-lowercase a-z
   // hostname with the right number of characters is likely from the detector
   // (and thus should be blocked).
   return ((host.length() == IntranetRedirectDetector::kNumCharsInHostnames) &&
       (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") ==
           std::string::npos)) ?
       net::ERR_NAME_NOT_RESOLVED :
       ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist,
                            os_error);
 }