Make using WebContentsUserData simpler.

chrome/browser/ui/hung_plugin_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/hung_plugin_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/process_util.h"
@@ skipping 18 matching lines @@
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
 #include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
 #endif
 
-int HungPluginTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(HungPluginTabHelper)
 
 namespace {
 
 // Delay in seconds before re-showing the hung plugin message. This will be
 // increased each time.
 const int kInitialReshowDelaySec = 10;
 
 #if defined(OS_WIN)
 
 const char kDumpChildProcessesSequenceName[] = "DumpChildProcesses";
@@ skipping 326 matching lines @@
     state->info_bar = NULL;
   }
 }
 
 InfoBarTabHelper* HungPluginTabHelper::GetInfoBarHelper() {
   TabContents* tab_contents = TabContents::FromWebContents(web_contents());
   if (!tab_contents)
     return NULL;
   return tab_contents->infobar_tab_helper();
 }