Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

chrome/browser/ui/search_engines/template_url_table_model.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/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
@@ skipping 236 matching lines @@
   template_url_service_->Remove(template_url);
   template_url_service_->AddObserver(this);
 }
 
 void TemplateURLTableModel::Add(int index,
                                 const string16& short_name,
                                 const string16& keyword,
                                 const std::string& url) {
   DCHECK(index >= 0 && index <= RowCount());
   template_url_service_->RemoveObserver(this);
-  TemplateURL* turl = new TemplateURL();
-  turl->set_short_name(short_name);
-  turl->set_keyword(keyword);
-  turl->SetURL(url);
+  TemplateURLData data;
+  data.short_name = short_name;
+  data.SetKeyword(keyword);
+  data.SetURL(url);
+  TemplateURL* turl = new TemplateURL(data);
   template_url_service_->Add(turl);
   ModelEntry* entry = new ModelEntry(this, turl);
   template_url_service_->AddObserver(this);
   entries_.insert(entries_.begin() + index, entry);
   if (observer_)
     observer_->OnItemsAdded(index, 1);
 }
 
 void TemplateURLTableModel::ModifyTemplateURL(int index,
                                               const string16& title,
@@ skipping 91 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       std::find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }