Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/api/prefs/pref_member_unittest.cc

 // Copyright (c) 2011 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/api/prefs/pref_member.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 59 matching lines @@
   void GetPrefValueOnIOThread() {
     value_ = pref_.GetValue();
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             MessageLoop::QuitClosure());
   }
 
   BooleanPrefMember pref_;
   bool value_;
 };
 
-class PrefMemberTestClass : public content::NotificationObserver {
+class PrefMemberTestClass : public PrefObserver {
  public:
   explicit PrefMemberTestClass(PrefService* prefs)
       : observe_cnt_(0), prefs_(prefs) {
     str_.Init(kStringPref, prefs, this);
   }
 
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) {
-    DCHECK(chrome::NOTIFICATION_PREF_CHANGED == type);
-    PrefService* prefs_in = content::Source<PrefService>(source).ptr();
-    EXPECT_EQ(prefs_in, prefs_);
-    std::string* pref_name_in = content::Details<std::string>(details).ptr();
-    EXPECT_EQ(*pref_name_in, kStringPref);
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE {
+    EXPECT_EQ(service, prefs_);
+    EXPECT_EQ(pref_name, kStringPref);
     EXPECT_EQ(str_.GetValue(), prefs_->GetString(kStringPref));
     ++observe_cnt_;
   }
 
   StringPrefMember str_;
   int observe_cnt_;
 
  private:
   PrefService* prefs_;
 };
@@ skipping 215 matching lines @@
   prefs.SetBoolean(kBoolPref, true);
 
   ASSERT_TRUE(callback->FetchValue());
   EXPECT_TRUE(callback->value());
 
   callback->Destroy();
 
   ASSERT_TRUE(callback->FetchValue());
   EXPECT_TRUE(callback->value());
 }