Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/omnibox/omnibox_edit_model.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/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 1098 matching lines @@
   // Then check if the text before the inserted space matches a keyword.
   string16 keyword;
   TrimWhitespace(new_text.substr(0, space_position), TRIM_LEADING, &keyword);
   return !keyword.empty() &&
       !autocomplete_controller_->keyword_provider()->
           GetKeywordForText(keyword).empty();
 }
 
 void OmniboxEditModel::NotifySearchTabHelper() {
   if (controller_->GetTabContents()) {
-    controller_->GetTabContents()->search_tab_helper()->
-        OmniboxEditModelChanged(user_input_in_progress_, !in_revert_);
+    chrome::search::SearchTabHelper::FromWebContents(
+        controller_->GetTabContents()->web_contents())->
+            OmniboxEditModelChanged(user_input_in_progress_, !in_revert_);
   }
 }
 
 bool OmniboxEditModel::DoInstant(const AutocompleteMatch& match) {
   if (in_revert_)
     return false;
 
   InstantController* instant = controller_->GetInstant();
 
   if (!instant)
@@ skipping 93 matching lines @@
 }
 
 void OmniboxEditModel::ClassifyStringForPasteAndGo(
     const string16& text,
     AutocompleteMatch* match,
     GURL* alternate_nav_url) const {
   DCHECK(match);
   AutocompleteClassifierFactory::GetForProfile(profile_)->Classify(text,
       string16(), false, false, match, alternate_nav_url);
 }