Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/intranet_redirect_detector.h

 // 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.
 
 #ifndef CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_
 #define CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_resolver_proc.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
-class PrefServiceSimple;
+class PrefRegistrySimple;
 
 // This object is responsible for determining whether the user is on a network
 // that redirects requests for intranet hostnames to another site, and if so,
 // tracking what that site is (including across restarts via a pref).  For
 // example, the user's ISP might convert a request for "http://query/" into a
 // 302 redirect to "http://isp.domain.com/search?q=query" in order to display
 // custom pages on typos, nonexistent sites, etc.
 //
 // We use this information in the AlternateNavURLFetcher to avoid displaying
 // infobars for these cases.  Our infobars are designed to allow users to get at
@@ skipping 14 matching lines @@
   // g_browser_process->intranet_redirect_detector() (which shouldn't be hard,
   // since there aren't useful public functions on this object for consumers to
   // access anyway).
   IntranetRedirectDetector();
   virtual ~IntranetRedirectDetector();
 
   // Returns the current redirect origin.  This will be empty if no redirection
   // is in place.
   static GURL RedirectOrigin();
 
-  static void RegisterPrefs(PrefServiceSimple* prefs);
+  static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // The number of characters the fetcher will use for its randomly-generated
   // hostnames.
   static const size_t kNumCharsInHostnames;
 
  private:
   typedef std::set<net::URLFetcher*> Fetchers;
 
   // Called when the seven second startup sleep or the one second network
   // switch sleep has finished.  Runs any pending fetch.
@@ skipping 26 matching lines @@
                       net::AddressFamily address_family,
                       net::HostResolverFlags host_resolver_flags,
                       net::AddressList* addrlist,
                       int* os_error) OVERRIDE;
 
  private:
   virtual ~IntranetRedirectHostResolverProc() {}
 };
 
 #endif  // CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_