Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/captive_portal/captive_portal_service.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_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/captive_portal/captive_portal_detector.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
-#include "content/public/browser/notification_observer.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/backoff_entry.h"
 
 class Profile;
 
 namespace captive_portal {
 
 // Service that checks for captive portals when queried, and sends a
 // NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT with the Profile as the source and
 // a CaptivePortalService::Results as the details.
 //
 // Captive portal checks are rate-limited.  The CaptivePortalService may only
 // be accessed on the UI thread.
 // Design doc: https://docs.google.com/document/d/1k-gP2sswzYNvryu9NcgN7q5XrsMlUdlUdoW9WRaEmfM/edit
 class CaptivePortalService : public ProfileKeyedService,
-                             public content::NotificationObserver,
+                             public PrefObserver,
                              public base::NonThreadSafe {
  public:
   enum TestingState {
     NOT_TESTING,
     DISABLED_FOR_TESTING,  // The service is always disabled.
     SKIP_OS_CHECK_FOR_TESTING  // The service can be enabled even if the OS has
                                // native captive portal detection.
   };
 
   // The details sent via a NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT.
@@ skipping 66 matching lines @@
   };
 
   // Initiates a captive portal check, without any throttling.  If the service
   // is disabled, just acts like there's an Internet connection.
   void DetectCaptivePortalInternal();
 
   // Called by CaptivePortalDetector when detection completes.
   void OnPortalDetectionCompleted(
       const CaptivePortalDetector::Results& results);
 
-  // content::NotificationObserver:
-  virtual void Observe(
-      int type,
-      const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE;
+  // PrefObserver
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
 
   // ProfileKeyedService:
   virtual void Shutdown() OVERRIDE;
 
   // Called when a captive portal check completes.  Passes the result to all
   // observers.
   void OnResult(Result result);
 
   // Updates BackoffEntry::Policy and creates a new BackoffEntry, which
   // resets the count used for throttling.
@@ skipping 78 matching lines @@
 
   // Test time ticks used by unit tests.
   base::TimeTicks time_ticks_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);
 };
 
 }  // namespace captive_portal
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_