Add enableReferrers and enableHyperlinkAuditing to contentSettings.misc API.

chrome/browser/prefs/pref_member.h

 // 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.
 //
 // 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 15 matching lines @@
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_observer.h"
+#include "content/common/notification_registrar.h"
 
 class PrefService;
+class Profile;
 
 namespace subtle {
 
 class PrefMemberBase : public NotificationObserver {
  protected:
   class Internal : public base::RefCountedThreadSafe<Internal> {
    public:
     Internal();
 
     // Update the value, either by calling |UpdateValueInternal| directly
@@ skipping 31 matching lines @@
 
   PrefMemberBase();
   virtual ~PrefMemberBase();
 
   // See PrefMember<> for description.
   void Init(const char* pref_name, PrefService* prefs,
             NotificationObserver* observer);
 
   virtual void CreateInternal() const = 0;
 
+  void ObserveProfileDestruction(Profile* profile);
+
   // See PrefMember<> for description.
   void Destroy();
 
   void MoveToThread(BrowserThread::ID thread_id);
 
   // NotificationObserver
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  void VerifyValuePrefName() const;
+  void VerifyValuePrefName() const {
+    DCHECK(!pref_name_.empty());
+  }
 
   // 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.
   virtual void UpdateValueFromPref() const;
 
   // Verifies the preference name, and lazily loads the preference value if
   // it hasn't been loaded yet.
-  void VerifyPref() const {
-    VerifyValuePrefName();
-    if (!internal())
-      UpdateValueFromPref();
-  }
+  void VerifyPref() const;
 
   const std::string& pref_name() const { return pref_name_; }
   PrefService* prefs() { return prefs_; }
   const PrefService* prefs() const { return prefs_; }
 
   virtual Internal* internal() const = 0;
 
  // Ordered the members to compact the class instance.
  private:
   std::string pref_name_;
+  NotificationRegistrar registrar_;
   NotificationObserver* observer_;
   PrefService* prefs_;
 
  protected:
   bool setting_value_;
 };
 
 }  // namespace subtle
 
 template <typename ValueType>
 class PrefMember : public subtle::PrefMemberBase {
  public:
   // Defer initialization to an Init method so it's easy to make this class be
   // a member variable.
   PrefMember() {}
   virtual ~PrefMember() {}
 
   // Do the actual initialization of the class.  |observer| may be null if you
   // don't want any notifications of changes.
   // This method should only be called on the UI thread.
   void Init(const char* pref_name, PrefService* prefs,
             NotificationObserver* observer) {
     subtle::PrefMemberBase::Init(pref_name, prefs, observer);
   }
 
+  // Starts observing PROFILE_DESTROYED notifications for the given |profile|,
+  // to automatically unsubscribe from the PrefService.
+  void ObserveProfileDestruction(Profile* profile) {
+    subtle::PrefMemberBase::ObserveProfileDestruction(profile);
+  }
+
   // Unsubscribes the PrefMember from the PrefService. After calling this
   // function, the PrefMember may not be used any more.
   // This method should only be called on the UI thread.
   void Destroy() {
     subtle::PrefMemberBase::Destroy();
   }
 
   // Moves the PrefMember to another thread, allowing read accesses from there.
   // Changes from the PrefService will be propagated asynchronously
   // via PostTask.
@@ skipping 83 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PrefMember);
 };
 
 typedef PrefMember<bool> BooleanPrefMember;
 typedef PrefMember<int> IntegerPrefMember;
 typedef PrefMember<double> DoublePrefMember;
 typedef PrefMember<std::string> StringPrefMember;
 typedef PrefMember<FilePath> FilePathPrefMember;
 
 #endif  // CHROME_BROWSER_PREFS_PREF_MEMBER_H_