Make using WebContentsUserData simpler.

chrome/browser/common/web_contents_user_data_unittest.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/common/web_contents_user_data.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #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>;
 };
 
 class WebContentsAttachedClass2
     : public WebContentsUserData<WebContentsAttachedClass2> {
  public:
   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;
 
 TEST_F(WebContentsUserDataTest, OneInstanceTwoAttachments) {
   content::WebContents* contents = web_contents();
   WebContentsAttachedClass1* class1 =
       WebContentsAttachedClass1::FromWebContents(contents);
   ASSERT_EQ(NULL, class1);
   WebContentsAttachedClass2* class2 =
       WebContentsAttachedClass2::FromWebContents(contents);
@@ skipping 52 matching lines @@
   WebContentsAttachedClass1::CreateForWebContents(contents);
   clazz = WebContentsAttachedClass1::FromWebContents(contents);
   ASSERT_TRUE(clazz != NULL);
 
   WebContentsAttachedClass1::CreateForWebContents(contents);
   WebContentsAttachedClass1* class_again =
       WebContentsAttachedClass1::FromWebContents(contents);
   ASSERT_TRUE(class_again != NULL);
   ASSERT_EQ(clazz, class_again);
 }