Add extra data to BrowserContext so that content layer and other embedders can stash data with it t…

content/browser/ssl/ssl_host_state.h

Index: content/browser/ssl/ssl_host_state.h
===================================================================
--- content/browser/ssl/ssl_host_state.h	(revision 121897)
+++ content/browser/ssl/ssl_host_state.h	(working copy)
@@ -14,15 +14,10 @@
 #include "base/basictypes.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/browser_context.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/x509_certificate.h"
 
-namespace content {
-class BrowserContext;
-}
-
 // SSLHostState
 //
 // The SSLHostState encapulates the host-specific state for SSL errors.  For
@@ -32,12 +27,12 @@
 // controllers.
 
 class CONTENT_EXPORT SSLHostState
-    : public content::NotificationObserver,
+    : NON_EXPORTED_BASE(public content::BrowserContext::UserData),
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   static SSLHostState* GetFor(content::BrowserContext* browser_context);
 
-  explicit SSLHostState(content::BrowserContext* browser_context);
+  SSLHostState();
   virtual ~SSLHostState();
 
   // Records that a host has run insecure content.
@@ -57,10 +52,6 @@
       net::X509Certificate* cert, const std::string& host);
 
  private:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // A BrokenHostEntry is a pair of (host, process_id) that indicates the host
   // contains insecure content in that renderer process.
   typedef std::pair<std::string, int> BrokenHostEntry;
@@ -73,8 +64,6 @@
   // Certificate policies for each host.
   std::map<std::string, net::CertPolicy> cert_policy_for_host_;
 
-  content::NotificationRegistrar registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(SSLHostState);
 };