Switch SearchEngineTabHelper to use WebContentsUserData.

chrome/browser/ui/search_engines/search_engine_tab_helper.cc

Index: chrome/browser/ui/search_engines/search_engine_tab_helper.cc
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
index d256a4078661f790e6b93d8155647061136875a7..4a9475633c868a8310855ba9c6f6545adaf75e24 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
@@ -23,6 +23,8 @@ using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
+int SearchEngineTabHelper::kUserDataKey;
+
 namespace {
 
 // Returns true if the entry's transition type is FORM_SUBMIT.
@@ -60,11 +62,6 @@ string16 GenerateKeywordFromNavigationEntry(const NavigationEntry* entry) {
 
 }  // namespace
 
-SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
-  DCHECK(web_contents);
-}
-
 SearchEngineTabHelper::~SearchEngineTabHelper() {
 }
 
@@ -84,6 +81,11 @@ bool SearchEngineTabHelper::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
+SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
+    : content::WebContentsObserver(web_contents) {
+  DCHECK(web_contents);
+}
+
 void SearchEngineTabHelper::OnPageHasOSDD(
     int32 page_id,
     const GURL& doc_url,