Switch PepperBrokerObserver to use WebContentsUserData.

chrome/browser/pepper_broker_observer.h

Index: chrome/browser/pepper_broker_observer.h
diff --git a/chrome/browser/pepper_broker_observer.h b/chrome/browser/pepper_broker_observer.h
index e49d962fcab8ff6eadf8f55d28b33e9bb9efee69..01f84bfb0117364d17f0d909aa8f27b1c12ee21e 100644
--- a/chrome/browser/pepper_broker_observer.h
+++ b/chrome/browser/pepper_broker_observer.h
@@ -5,20 +5,25 @@
 #ifndef CHROME_BROWSER_PEPPER_BROKER_OBSERVER_H_
 #define CHROME_BROWSER_PEPPER_BROKER_OBSERVER_H_
 
+#include "chrome/browser/tab_contents/web_contents_user_data.h"
 #include "content/public/browser/web_contents_observer.h"
 
-class PepperBrokerObserver : public content::WebContentsObserver {
+class PepperBrokerObserver : public content::WebContentsObserver,
+                             public WebContentsUserData<PepperBrokerObserver> {
  public:
-  explicit PepperBrokerObserver(content::WebContents* web_contents);
   virtual ~PepperBrokerObserver();
 
+ private:
+  explicit PepperBrokerObserver(content::WebContents* web_contents);
+  static int kUserDataKey;
+  friend class WebContentsUserData<PepperBrokerObserver>;
+
   virtual bool RequestPpapiBrokerPermission(
       content::WebContents* web_contents,
       const GURL& url,
       const FilePath& plugin_path,
       const base::Callback<void(bool)>& callback) OVERRIDE;
 
- private:
   DISALLOW_COPY_AND_ASSIGN(PepperBrokerObserver);
 };