Make using WebContentsUserData simpler.

chrome/browser/common/web_contents_user_data_unittest.cc

Index: chrome/browser/common/web_contents_user_data_unittest.cc
diff --git a/chrome/browser/common/web_contents_user_data_unittest.cc b/chrome/browser/common/web_contents_user_data_unittest.cc
index cb35bacadd6b63509d97537261aaad6eba63ac48..1ee3a6ad26a7071b1841d6f55e66fc8d9d774bc7 100644
--- a/chrome/browser/common/web_contents_user_data_unittest.cc
+++ b/chrome/browser/common/web_contents_user_data_unittest.cc
@@ -11,15 +11,12 @@
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
 class WebContentsAttachedClass1
     : public WebContentsUserData<WebContentsAttachedClass1> {
  public:
   virtual ~WebContentsAttachedClass1() {}
  private:
   explicit WebContentsAttachedClass1(content::WebContents* contents) {}
-  static int kUserDataKey;
   friend class WebContentsUserData<WebContentsAttachedClass1>;
 };
 
@@ -29,14 +26,11 @@ class WebContentsAttachedClass2
   virtual ~WebContentsAttachedClass2() {}
  private:
   explicit WebContentsAttachedClass2(content::WebContents* contents) {}
-  static int kUserDataKey;
   friend class WebContentsUserData<WebContentsAttachedClass2>;
 };
 
-int WebContentsAttachedClass1::kUserDataKey;
-int WebContentsAttachedClass2::kUserDataKey;
-
-}  // namespace
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebContentsAttachedClass1)
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebContentsAttachedClass2)
 
 typedef ChromeRenderViewHostTestHarness WebContentsUserDataTest;