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

chrome/browser/search_engines/template_url_fetcher.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 "build/build_config.h"
 
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 159 matching lines @@
       fetcher_->profile());
   if (!model->loaded())
     return;
   AddSearchProvider();
   // WARNING: AddSearchProvider deletes us.
 }
 
 void TemplateURLFetcher::RequestDelegate::AddSearchProvider() {
   DCHECK(template_url_.get());
   DCHECK(!keyword_.empty());
-  TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
-      fetcher_->profile());
+  Profile* profile = fetcher_->profile();
+  TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(profile);
   DCHECK(model);
   DCHECK(model->loaded());
 
   const TemplateURL* existing_url = NULL;
   if (model->CanReplaceKeyword(keyword_, GURL(template_url_->url()),
                                &existing_url)) {
     if (existing_url)
       model->Remove(existing_url);
   } else if (provider_type_ == AUTODETECTED_PROVIDER) {
     fetcher_->RequestCompleted(this);  // WARNING: Deletes us!
     return;
   }
 
   // The short name is what is shown to the user. We preserve original names
   // since it is better when generated keyword in many cases.
   TemplateURLData data(template_url_->data());
   data.SetKeyword(keyword_);
   data.originating_url = osdd_url_;
 
   // The page may have specified a URL to use for favicons, if not, set it.
   if (!data.favicon_url.is_valid())
     data.favicon_url = favicon_url_;
 
   switch (provider_type_) {
     case AUTODETECTED_PROVIDER:
       // Mark the keyword as replaceable so it can be removed if necessary.
       data.safe_for_autoreplace = true;
-      model->Add(new TemplateURL(data));
+      model->Add(new TemplateURL(profile, data));
       break;
 
     case EXPLICIT_PROVIDER:
       // Confirm addition and allow user to edit default choices. It's ironic
       // that only *non*-autodetected additions get confirmed, but the user
       // expects feedback that his action did something.
       // The source WebContents' delegate takes care of adding the URL to the
       // model, which takes ownership, or of deleting it if the add is
       // cancelled.
-      callbacks_->ConfirmAddSearchProvider(new TemplateURL(data),
-                                           fetcher_->profile());
+      callbacks_->ConfirmAddSearchProvider(new TemplateURL(profile, data),
+                                           profile);
       break;
 
     default:
       NOTREACHED();
       break;
   }
 
   fetcher_->RequestCompleted(this);
   // WARNING: RequestCompleted deletes us.
 }
@@ skipping 55 matching lines @@
                           owned_callbacks.release(), provider_type));
 }
 
 void TemplateURLFetcher::RequestCompleted(RequestDelegate* request) {
   Requests::iterator i =
       std::find(requests_->begin(), requests_->end(), request);
   DCHECK(i != requests_->end());
   requests_->erase(i);
   delete request;
 }