Switch OmniboxSearchHint to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.cc

Index: chrome/browser/ui/tab_contents/tab_contents.cc
diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc
index b035de4c5ce65d79dced5822e5b890d58559696f..8c0b52928927a93f64b6e539e5590c54126fe6e8 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -166,6 +166,8 @@ TabContents::TabContents(WebContents* contents)
 #endif
 
 #if !defined(OS_ANDROID)
+  if (OmniboxSearchHint::IsEnabled(profile()))
+    OmniboxSearchHint::CreateForWebContents(contents);
   PDFTabHelper::CreateForWebContents(contents);
   sad_tab_helper_.reset(new SadTabHelper(contents));
   web_intent_picker_controller_.reset(new WebIntentPickerController(this));
@@ -180,11 +182,6 @@ TabContents::TabContents(WebContents* contents)
     webnavigation_observer_.reset(
         new extensions::WebNavigationTabObserver(contents));
 
-#if !defined(OS_ANDROID)
-  if (OmniboxSearchHint::IsEnabled(profile()))
-    omnibox_search_hint_.reset(new OmniboxSearchHint(this));
-#endif
-
 #if defined(ENABLE_PRINTING)
   print_view_manager_.reset(new printing::PrintViewManager(this));
   print_preview_.reset(new printing::PrintPreviewMessageHandler(contents));