Make using WebContentsUserData simpler.

chrome/browser/ui/blocked_content/blocked_content_tab_helper.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/ui/blocked_content/blocked_content_tab_helper.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_container.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 using content::NavigationEntry;
 
-int BlockedContentTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(BlockedContentTabHelper)
 
 BlockedContentTabHelper::BlockedContentTabHelper(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       blocked_contents_(new BlockedContentContainer(web_contents)),
       all_contents_blocked_(false),
       delegate_(NULL) {
 }
 
 BlockedContentTabHelper::~BlockedContentTabHelper() {
@@ skipping 110 matching lines @@
 }
 
 size_t BlockedContentTabHelper::GetBlockedContentsCount() const {
   return blocked_contents_->GetBlockedContentsCount();
 }
 
 void BlockedContentTabHelper::GetBlockedContents(
     std::vector<content::WebContents*>* blocked_contents) const {
   blocked_contents_->GetBlockedContents(blocked_contents);
 }