Remove PrefObserver usage, batch 3.

chrome/browser/api/prefs/pref_member.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.
 //
 // A helper class that stays in sync with a preference (bool, int, real,
 // string or filepath).  For example:
 //
 // class MyClass {
 //  public:
 //   MyClass(PrefService* prefs) {
@@ skipping 29 matching lines @@
 class PrefServiceBase;
 
 namespace subtle {
 
 class PrefMemberBase : public PrefObserver {
  public:
   // Type of callback you can register if you need to know the name of
   // the pref that is changing.
   typedef base::Callback<void(const std::string&)> NamedChangeCallback;
 
+  const std::string& pref_name() const { return pref_name_; }

[Mattias Nissler (ping if slow), 2012/11/13 15:47:03]

Note that there already is a public GetPrefName in PrefMember below, I think we
only want one.

[Jói, 2012/11/13 16:28:24]

Right you are, sorry I didn't notice.  Moved this back.

+  PrefServiceBase* prefs() { return prefs_; }
+  const PrefServiceBase* prefs() const { return prefs_; }
+
  protected:
   class Internal : public base::RefCountedThreadSafe<Internal> {
    public:
     Internal();
 
     // Update the value, either by calling |UpdateValueInternal| directly
     // or by dispatching to the right thread.
     // Takes ownership of |value|.
     void UpdateValue(base::Value* value,
                      bool is_managed,
@@ skipping 57 matching lines @@
 
   // This method is used to do the actual sync with the preference.
   // Note: it is logically const, because it doesn't modify the state
   // seen by the outside world. It is just doing a lazy load behind the scenes.
   void UpdateValueFromPref() const;
 
   // Verifies the preference name, and lazily loads the preference value if
   // it hasn't been loaded yet.
   void VerifyPref() const;
 
-  const std::string& pref_name() const { return pref_name_; }
-  PrefServiceBase* prefs() { return prefs_; }
-  const PrefServiceBase* prefs() const { return prefs_; }
-
   virtual Internal* internal() const = 0;
 
   // Used to allow registering plain base::Closure callbacks.
   static void InvokeUnnamedCallback(const base::Closure& callback,
                                     const std::string& pref_name);
 
  private:
   // Ordered the members to compact the class instance.
   std::string pref_name_;
   NamedChangeCallback observer_;
@@ skipping 149 matching lines @@
 
 typedef PrefMember<bool> BooleanPrefMember;
 typedef PrefMember<int> IntegerPrefMember;
 typedef PrefMember<double> DoublePrefMember;
 typedef PrefMember<std::string> StringPrefMember;
 typedef PrefMember<FilePath> FilePathPrefMember;
 // This preference member is expensive for large string arrays.
 typedef PrefMember<std::vector<std::string> > StringListPrefMember;
 
 #endif  // CHROME_BROWSER_API_PREFS_PREF_MEMBER_H_