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

chrome/browser/ui/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 1634 matching lines @@
     // Handle Vista way of searching - "? <search-term>"
     if (param.value().size() > 2 &&
         param.value()[0] == '?' && param.value()[1] == ' ') {
       const TemplateURL* default_provider =
           TemplateURLServiceFactory::GetForProfile(profile)->
           GetDefaultSearchProvider();
       if (default_provider) {
         const TemplateURLRef& search_url = default_provider->url_ref();
         DCHECK(search_url.SupportsReplacement());
         string16 search_term = param.LossyDisplayName().substr(2);
-        urls.push_back(GURL(search_url.ReplaceSearchTermsUsingProfile(
-            profile, search_term, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
-            string16())));
+        urls.push_back(GURL(search_url.ReplaceSearchTerms(search_term,
+            TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())));
         continue;
       }
     }
 
     // Otherwise, fall through to treating it as a URL.
 
     // This will create a file URL or a regular URL.
     // This call can (in rare circumstances) block the UI thread.
     // Allow it until this bug is fixed.
     //  http://code.google.com/p/chromium/issues/detail?id=60641
@@ skipping 276 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }