Make using WebContentsUserData simpler.

chrome/browser/pepper_broker_observer.cc

 // 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.
 
 #include "chrome/browser/pepper_broker_observer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
@@ skipping 13 matching lines @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
-int PepperBrokerObserver::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(PepperBrokerObserver)
 
 namespace {
 
 // The URL for the "learn more" article about the PPAPI broker.
 const char kPpapiBrokerLearnMoreUrl[] =
     "https://support.google.com/chrome/?p=ib_pepper_broker";
 
 class PepperBrokerInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   static void Show(
@@ skipping 179 matching lines @@
               infobar_helper, url, plugin_path, languages, content_settings,
               callback));
       break;
     }
     default:
       NOTREACHED();
   }
 
   return true;
 }