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

chrome/browser/importer/firefox2_importer.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/importer/firefox2_importer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 116 matching lines @@
 }
 
 // static
 TemplateURL* Firefox2Importer::CreateTemplateURL(const string16& title,
                                                  const string16& keyword,
                                                  const GURL& url) {
   // Skip if the keyword or url is invalid.
   if (keyword.empty() || !url.is_valid())
     return NULL;
 
-  TemplateURL* t_url = new TemplateURL();
+  TemplateURLData data;
   // We set short name by using the title if it exists.
   // Otherwise, we use the shortcut.
-  t_url->set_short_name(title.empty() ? keyword : title);
-  t_url->set_keyword(keyword);
-  t_url->SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url.spec())));
-  return t_url;
+  data.short_name = title.empty() ? keyword : title;
+  data.SetKeyword(keyword);
+  data.SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url.spec())));
+  return new TemplateURL(data);
 }
 
 // static
 void Firefox2Importer::ImportBookmarksFile(
     const FilePath& file_path,
     const std::set<GURL>& default_urls,
     Importer* importer,
     std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
     std::vector<TemplateURL*>* template_urls,
     std::vector<history::ImportedFaviconUsage>* favicons) {
@@ skipping 503 matching lines @@
 
   // We need to make up a URL for the favicon. We use a version of the page's
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
 }