Add a Profile* member to TemplateURL. This makes some invocations of ReplaceSearchTerms() a bit le…

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 1825 matching lines @@
         string16 keyword(TemplateURLService::GenerateKeyword(params_.page_url,
                                                              false));
         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_wrapper->search_engine_tab_helper()->delegate()->
-            ConfirmAddSearchProvider(new TemplateURL(data), profile_);
+            ConfirmAddSearchProvider(new TemplateURL(profile_, data), profile_);
       }
       break;
     }
 
     case IDC_CONTENT_CONTEXT_SPEECH_INPUT_FILTER_PROFANITIES: {
       PrefService* prefs = profile_->GetPrefs();
       const bool filter = !prefs->GetBoolean(
           prefs::kSpeechRecognitionFilterProfanities);
       prefs->SetBoolean(prefs::kSpeechRecognitionFilterProfanities, filter);
       profile_->GetSpeechRecognitionPreferences()->SetFilterProfanities(filter);
@@ skipping 126 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);
 }