Switch SearchEngineTabHelper to use WebContentsUserData.

chrome/browser/tab_contents/render_view_context_menu.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 <algorithm>
 #include <set>
 #include <utility>
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
@@ skipping 1867 matching lines @@
     }
 
     case IDC_CONTENT_CONTEXT_ADDSEARCHENGINE: {
       // Make sure the model is loaded.
       TemplateURLService* model =
           TemplateURLServiceFactory::GetForProfile(profile_);
       if (!model)
         return;
       model->Load();
 
-      TabContents* tab_contents =
-          TabContents::FromWebContents(source_web_contents_);
-      if (tab_contents &&
-          tab_contents->search_engine_tab_helper() &&
-          tab_contents->search_engine_tab_helper()->delegate()) {
+      SearchEngineTabHelper* search_engine_tab_helper =
+          SearchEngineTabHelper::FromWebContents(source_web_contents_);
+      if (search_engine_tab_helper &&
+          search_engine_tab_helper->delegate()) {
         string16 keyword(TemplateURLService::GenerateKeyword(params_.page_url));
         TemplateURLData data;
         data.short_name = keyword;
         data.SetKeyword(keyword);
         data.SetURL(params_.keyword_url.spec());
         data.favicon_url =
             TemplateURL::GenerateFaviconURL(params_.page_url.GetOrigin());
         // Takes ownership of the TemplateURL.
-        tab_contents->search_engine_tab_helper()->delegate()->
+        search_engine_tab_helper->delegate()->
             ConfirmAddSearchProvider(new TemplateURL(profile_, data), profile_);
       }
       break;
     }
 
 #if defined(ENABLE_INPUT_SPEECH)
     case IDC_CONTENT_CONTEXT_SPEECH_INPUT_FILTER_PROFANITIES: {
       ChromeSpeechRecognitionPreferences::GetForProfile(profile_)->
           ToggleFilterProfanities();
       break;
@@ skipping 128 matching lines @@
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }