Switch SearchEngineTabHelper to use WebContentsUserData.

chrome/browser/tab_contents/render_view_context_menu.cc

Index: chrome/browser/tab_contents/render_view_context_menu.cc
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 6d1989f4fe07b0666b1735d933ef7adc87e2fa28..954c9631547df46b3f8713340af895790019beb1 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -1885,11 +1885,10 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
         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;
@@ -1898,7 +1897,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
         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;