Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/ui/search_engines/keyword_editor_controller.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/search_engines/keyword_editor_controller.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 21 matching lines @@
   prefs->RegisterDictionaryPref(prefs::kKeywordEditorWindowPlacement);
 }
 
 int KeywordEditorController::AddTemplateURL(const string16& title,
                                             const string16& keyword,
                                             const std::string& url) {
   DCHECK(!url.empty());
 
   content::RecordAction(UserMetricsAction("KeywordEditor_AddKeyword"));
 
-  TemplateURL* template_url = new TemplateURL();
-  template_url->set_short_name(title);
-  template_url->set_keyword(keyword);
-  template_url->SetURL(url, 0, 0);
-
   // There's a bug (1090726) in TableView with groups enabled such that newly
   // added items in groups ALWAYS appear at the end, regardless of the index
   // passed in. Worse yet, the selected rows get messed up when this happens
   // causing other problems. As a work around we always add the item to the end
   // of the list.
   const int new_index = table_model_->RowCount();
-  table_model_->Add(new_index, template_url);
+  table_model_->Add(new_index, title, keyword, url);
 
   return new_index;
 }
 
 void KeywordEditorController::ModifyTemplateURL(const TemplateURL* template_url,
                                                 const string16& title,
                                                 const string16& keyword,
                                                 const std::string& url) {
   const int index = table_model_->IndexOfTemplateURL(template_url);
   if (index == -1) {
@@ skipping 41 matching lines @@
   return url_model()->loaded();
 }
 
 const TemplateURL* KeywordEditorController::GetTemplateURL(int index) const {
   return table_model_->GetTemplateURL(index);
 }
 
 TemplateURLService* KeywordEditorController::url_model() const {
   return table_model_->template_url_service();
 }