Make using WebContentsUserData simpler.

chrome/browser/automation/automation_tab_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_TAB_HELPER_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_TAB_HELPER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/tab_contents/web_contents_user_data.h"
+#include "chrome/browser/common/web_contents_user_data.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class AutomationTabHelper;
 
 // An observer API implemented by classes which are interested in various
 // tab events from AutomationTabHelper(s).
 class TabEventObserver {
  public:
   // |LOAD_START| and |LOAD_STOP| notifications may occur several times for a
   // sequence of loads that may appear as one complete navigation to a user.
@@ skipping 67 matching lines @@
   // Dumps a heap profile.
   void HeapProfilerDump(const std::string& reason);
 #endif  // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
 
   // Returns true if the tab is loading or the tab is scheduled to load
   // immediately. Note that scheduled loads may be canceled.
   bool has_pending_loads() const;
 
  private:
   explicit AutomationTabHelper(content::WebContents* web_contents);
-  static int kUserDataKey;
   friend class WebContentsUserData<AutomationTabHelper>;
 
   friend class AutomationTabHelperTest;
 
   void OnSnapshotEntirePageACK(
       bool success,
       const std::vector<unsigned char>& png_data,
       const std::string& error_msg);
 
   // content::WebContentsObserver implementation.
@@ skipping 18 matching lines @@
   // redirect.
   std::set<int64> pending_client_redirects_;
 
   // List of all the |TabEventObserver|s, which we broadcast events to.
   ObserverList<TabEventObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationTabHelper);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_TAB_HELPER_H_